detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 17:47:59 +02:00
Code Issues Actions Packages Releases Activity

Internal timer added

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@39 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2011-11-03 13:59:28 +00:00
parent 848305f9ac
commit e4543697c7
5 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -74,7 +74,7 @@ int decode_function() {
#endif
n = receiveDataOnly(&fnum,sizeof(fnum));
if (n <= 0) {
printf("ERROR reading from socket %d", n);
printf("ERROR reading from socket %d\n", n);
return FAIL;
}
#ifdef VERBOSE
@ -1965,6 +1965,12 @@ int get_time_left(int fnum) {
case PROGRESS:
retval=getProgress();
break;
case ACTUAL_TIME:
retval=getActualTime();
break;
case MEASUREMENT_TIME:
retval=getMeasurementTime();
break;
default:
ret=FAIL;
sprintf(mess,"timer index unknown %d\n",ind);
@ -1976,12 +1982,21 @@ int get_time_left(int fnum) {
printf("get time left failed\n");
}
#ifdef VERBOSE
printf("time left on timer %d is %lld\n",ind, retval);
#endif
n = sendDataOnly(&ret,sizeof(ret));
if (ret!=OK) {
n += sendDataOnly(mess,sizeof(mess));
} else {
n = sendDataOnly(&retval,sizeof(retval));
}
#ifdef VERBOSE
printf("data sent\n");
#endif
return ret;