Index: fact/FADctrl/FAD.cc =================================================================== --- fact/FADctrl/FAD.cc (revision 10117) +++ fact/FADctrl/FAD.cc (revision 10120) @@ -68,6 +68,5 @@ // Construct boards - BoardList = Tokenize(GetConfig("BoardList","129.217.160.119")); - BoardList = Tokenize("192.33.99.225"); + BoardList = Tokenize(GetConfig("BoardList")); for (unsigned int i=0; i BoardList; std::vector Boards; @@ -88,4 +87,5 @@ int Pipe[2]; int NumEventsRequested; // Number of events requested + std::vector BoardList; }; Index: fact/FADctrl/FADBoard.cc =================================================================== --- fact/FADctrl/FADBoard.cc (revision 10117) +++ fact/FADctrl/FADBoard.cc (revision 10120) @@ -23,8 +23,22 @@ ACalibTime = -1; Status.Update.tv_sec = -1; - Thread = pthread_self(); // For checking in destructor Name = new char [Server.size()+1]; // Name in permanent memory for DIM service strcpy(Name, Server.c_str()); + + // Initialise mutex for synchronization + pthread_mutexattr_t Attr; + + if ((Ret = pthread_mutexattr_settype(&Attr, PTHREAD_MUTEX_ERRORCHECK)) != 0) { + m->Message(m->ERROR, "pthread_mutex_settype() failed (%s)", strerror(Ret)); + } + if ((Ret = pthread_mutex_init(&Mutex, &Attr)) != 0) { + m->Message(m->FATAL, "pthread_mutex_init() failed (%s)", strerror(Ret)); + } + + // Initialise condition variable for synchronization + if ((Ret = pthread_cond_init(&CondVar, NULL)) != 0) { + m->Message(m->FATAL, "pthread_cond_init() failed (%s)", strerror(Ret)); + } // Resolve hostname @@ -37,5 +51,5 @@ // Open socket descriptor if ((Socket = socket(PF_INET, SOCK_STREAM, 0)) == -1) { - m->PrintMessage("Could not open socket for %s (%s)\n", Server.c_str(), strerror(errno)); + m->Message(m->ERROR, "Could not open socket for %s (%s)\n", Server.c_str(), strerror(errno)); return; } @@ -62,26 +76,12 @@ DIM_ROI = new DimService((ID.str()+"ROI").c_str(), (char *) "S", NULL, 0); - // Initialise mutex for synchronization - pthread_mutexattr_t Attr; - - if ((Ret = pthread_mutexattr_settype(&Attr, PTHREAD_MUTEX_ERRORCHECK)) != 0) { - m->Message(m->ERROR, "pthread_mutex_settype() failed (%s)", strerror(Ret)); - } - if ((Ret = pthread_mutex_init(&Mutex, &Attr)) != 0) { - m->Message(m->ERROR, "pthread_mutex_init() failed (%s)", strerror(Ret)); - return; - } - - // Initialise condition variable for synchronization - if ((Ret = pthread_cond_init(&CondVar, NULL)) != 0) { - m->Message(m->ERROR, "pthread_cond_init() failed (%s)", strerror(Ret)); - return; - } - // Create thread that receives data if ((Ret = pthread_create(&Thread, NULL, (void * (*)(void *)) LaunchThread,(void *) this)) != 0) { - m->Message(m->ERROR, "pthread_create() failed in FADBoard() (%s)\n", strerror(Ret)); - Thread = pthread_self(); - return; + m->Message(m->FATAL, "pthread_create() failed in FADBoard() (%s)", strerror(Ret)); + } + + // Create thread to connect to other sockets + if ((Ret = pthread_create(&OtherThread, NULL, (void * (*)(void *)) OpenOtherSockets, (void *) Name)) != 0) { + m->Message(m->FATAL, "pthread_create() failed for OpenOtherSockets (%s)", strerror(Ret)); } @@ -96,8 +96,34 @@ int Ret; - // Cancel thread (if it did not quit already) and wait for it to quit - if (pthread_equal(Thread, pthread_self()) == 0) { - if ((Ret = pthread_cancel(Thread)) != 0 && Ret != ESRCH) m->Message(m->ERROR, "pthread_cancel() failed in ~FADBoard() (%s)", strerror(Ret)); - if ((Ret = pthread_join(Thread, NULL)) != 0) m->Message(m->ERROR, "pthread_join() failed in ~FADBoard (%s)", strerror(Ret)); + // Avoid segmentation faults by chekcing for InitOK + if (InitOK) { + // Terminate thread for other sockets + if ((Ret = pthread_cancel(OtherThread)) != 0) { + m->Message(m->ERROR, "pthread_cancel() failed in ~FADBoard() for OtherThread (%s)", strerror(Ret)); + } + if ((Ret = pthread_join(OtherThread, NULL)) != 0) { + m->Message(m->ERROR, "pthread_join() failed in ~FADBoard for OtherThread (%s)", strerror(Ret)); + } + + // Cancel thread (if it did not quit already) and wait for it to quit + if ((Ret = pthread_cancel(Thread)) != 0 && Ret != ESRCH) { + m->Message(m->ERROR, "pthread_cancel() failed in ~FADBoard() (%s)", strerror(Ret)); + } + if ((Ret = pthread_join(Thread, NULL)) != 0) { + m->Message(m->ERROR, "pthread_join() failed in ~FADBoard (%s)", strerror(Ret)); + } + + delete DIM_Name; + delete DIM_ID; + delete DIM_Temp; + delete DIM_DAC; + delete DIM_ROI; + } + + delete[] Name; + + // Close socket descriptor + if ((Socket != -1) && (close(Socket) == -1)) { + m->PrintMessage("Could not close socket descriptor (%s)", strerror(errno)); } @@ -108,18 +134,6 @@ // Delete mutex - if (InitOK && ((Ret = pthread_mutex_destroy(&Mutex)) != 0)) { + if ((Ret = pthread_mutex_destroy(&Mutex)) != 0) { m->Message(m->ERROR, "pthread_mutex_destroy() failed in ~FADBoard (%s)", strerror(Ret)); - } - - delete DIM_Name; - delete DIM_ID; - delete DIM_Temp; - delete DIM_DAC; - delete DIM_ROI; - delete[] Name; - - // Close socket descriptor - if ((Socket != -1) && (close(Socket) == -1)) { - m->PrintMessage("Could not close socket descriptor (%s)", strerror(errno)); } } @@ -524,2 +538,69 @@ } } + + +// +// OpenOtherSockets() +// +void FADBoard::OpenOtherSockets(char *Hostname) { + + int List[] = {5001, 5002, 5003, 5004, 5005, 5006, 5007}; + int Socket[sizeof(List)/sizeof(int)], MaxSocketNum=0, Ret; + fd_set DescriptorList; + char Buffer[1000000]; + + // Resolve hostname + struct hostent *Host = gethostbyname(Hostname); + if (Host == 0) { + printf("OtherSockets: Could not resolve host name for %s\n", Hostname); + return; + } + + // Connect to server + struct sockaddr_in SocketAddress; + SocketAddress.sin_family = PF_INET; + SocketAddress.sin_addr = *(struct in_addr*) Host->h_addr; + + for (unsigned int i=0; i MaxSocketNum) MaxSocketNum = Socket[i]; + + // Connect to server + SocketAddress.sin_port = htons((unsigned short) List[i]); + if (connect(Socket[i], (struct sockaddr *) &SocketAddress, sizeof(SocketAddress)) == -1) { + printf("OtherSockets: Could not connect to port %d (%s)\n", List[i], strerror(errno)); + return; + } + } + + while(true) { + // Wait for data from terminal (stdin) or from sockets + FD_ZERO(&DescriptorList); + for (unsigned int i=0; ih_addr; - - for (unsigned int i=0; i MaxSocketNum) MaxSocketNum = Socket[i]; - - // Connect to server - SocketAddress.sin_port = htons((unsigned short) List[i]); - if (connect(Socket[i], (struct sockaddr *) &SocketAddress, sizeof(SocketAddress)) == -1) { - printf("OtherSockets: Could not connect to port %d (%s)\n", List[i], strerror(errno)); - return; - } - } - - while(true) { - // Wait for data from terminal (stdin) or from sockets - FD_ZERO(&DescriptorList); - for (unsigned int i=0; i