5b01b4cbd8
Merge branch 'developer' into esrfchanges
2018-05-02 16:57:03 +02:00
d3a0319863
esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails
2018-05-02 16:49:27 +02:00
fdd19bc316
slsReceiver: udp socket buffer size, additional prints
2018-05-01 12:01:33 +02:00
1152555663
esrf changes: rx_udpsocksize sets/gets udp socket buffer size to be set, rx_realudpsocksize gets the real udp sock size buffer. At receiver config and at rx_udpsocksize command, dummy udp sockets created to know if set udp sock size fails (if fail, set to previous value), and also to get the real udp sock buffer size
2018-05-01 11:55:48 +02:00
99281e2690
esrf changes: previous commit compile
2018-04-26 16:43:07 +02:00
173d8f740e
esrf changes: slsReceiver: better checking of socket buffer pars. and warn on failures
...
* not done. The 'setsockopt(SO_RECVBUF)' system call cannot set the socket buffer
size lager than the specified in net.core.rmem_max. The requested value
was 2 GB (commit 3b0e2e6), which is far too large for this application,
so it was restored to the acceptable 100 MB value.
* The syscall does not fail if the requested buffer size is larger than
net.core.rmem_max. Use 'setsockopt(SO_RECVBUFFORCE)' to actually force a
value larger than the system limit, which can be done if run in a
privileged context (capability CAP_NET_ADMIN set).
* The real value is read with 'getsockopt(SO_RECVBUF)'. If it
corresponds to twice the requested value (see 'man 7 socket'), it is
printed in green, otherwise it is signalled in red.
* The 'setsockopt(SO_RECVBUFFORCE)' syscall removes the need to write to
/proc/sys/net/core/rmem_max, so this was was suppressed in the
'UDPStandardImplementation' constructor.
* The test on EIGER detectors before setting the system
buffers was removed. Was there for 9m/2m eiger, but one can take care of
memory requirements using a customizable max socket buffer size(only with
permissions). to be implmented later.
* The file /proc/sys/net/core/netdev_max_backlog is first read by the
receiver to check is the current value is OK. If it is not, the receiver
directly writes the good value into the file (instead of delegating to
the system shell), printing a red error message if there is an access
error (non-privileged user).
2018-04-26 15:22:44 +02:00
1247f760f2
virtual hdf file mapping fix for fnum-1 images
2018-04-25 17:39:09 +02:00
1c49fbb090
virtual hdf file mapping fnum-1 images, fixed
2018-04-25 16:52:14 +02:00
b5909044f6
slsReceiver: remove static members in Listener, DataProcessing and DataStreamer:
...
* Needed when more than one receiver is created by process
* Replace NumberofXxxx by explicit index in constructor
* Remove Error[Mask], use return value in constructor signature
* Replace RunningMask by individual Running flags
* Remove obsolete Mutex objects
2018-04-25 09:24:39 +02:00
e0bb7d74f4
esrf changes: eiver: initialise global optind variable before calling getopt_long: Needed when multiple receivers are instantiated in the same process
2018-04-23 17:43:54 +02:00
d38108e527
esrf changes: slsReceiver: extend CircularFifo to support blocking/non-blocking transfers:
...
* Add blocking push (for performance) and non-blocking pop (for symmetry), default to blocking operations
* Fix memory fault if Fifo allocation fails
* Fix fifoFree initialisation to fifoSize elements (was fifoSize - 1)
2018-04-23 17:32:40 +02:00
c35203ebfb
fixed gitinfo
2018-04-23 14:19:55 +02:00
03e781a0ac
subperiod for eiger implemented in client side
2018-04-23 11:03:23 +02:00
e024774323
added storage cells
2018-04-13 15:05:43 +02:00
d3c807975f
adding a semaphore to handle end of acq
2018-04-12 15:50:27 +02:00
28af3c2642
insignificant print
2018-04-09 17:44:55 +02:00
2bd8e6c166
zmq fixed to have additional json headers using rx_zmqjsonheader
2018-04-09 16:33:14 +02:00
8cf6e0cbd6
in between
2018-04-06 17:48:10 +02:00
61897cbd41
in between
2018-04-04 14:27:53 +02:00
fe2ba8621b
updating versioning to only have date
2018-03-27 11:00:15 +02:00
b029f1fa26
Common mode added, working for gotthard double modules
2018-03-26 09:07:27 +02:00
14546247e4
adding a receiver callback to be able to give modified size from the callback
2018-03-22 14:34:03 +01:00
a74e8f68f7
size change in receiver call back API now streamed, gui allows smaller packet size than expected to be caught and replaced the rest with 0xFF
2018-03-21 17:08:38 +01:00
dd6301d66d
updated for compilation
2018-03-14 16:19:30 +01:00
b58c3e8951
solving merging conflicts from 3.1.0 to developer
2018-03-14 15:45:35 +01:00
72970c9669
updated binaries, updated manuals, updated git versioning
2018-03-12 14:21:02 +01:00
61e7c0148f
updating versions to 3.1.0
2018-02-27 12:40:53 +01:00
Andrä Marie
3aeb3f58d1
first mythen3Server commit
2018-01-22 14:01:46 +01:00
Andrä Marie
92b4b3324e
first mythen3 server commit
2018-01-18 09:25:06 +01:00
Dhanya Maliakal
65a91c519e
Merge branch '3.0.1' into developer
2017-12-14 14:29:16 +01:00
Dhanya Maliakal
0649626842
made the color fix for black/white backgrounds
2017-12-14 14:29:07 +01:00
Dhanya Maliakal
24c305ec59
solved conflicts from merge of version being used to binary
2017-12-06 19:07:06 +01:00
Dhanya Maliakal
c4a242e10a
changed all variables from svn to git, included --version for receiver binary
2017-12-06 10:29:57 +01:00
Dhanya Maliakal
2f3dc8d109
Merge branch '3.0.1' into developer
2017-12-06 08:44:21 +01:00
Dhanya Maliakal
7436d6c8d3
updaterev
2017-12-06 08:44:07 +01:00
Dhanya Maliakal
0ef52138e1
merge conflict sorted, removing rest
2017-12-05 11:25:10 +01:00
Dhanya Maliakal
65b4c69847
REST implementation removed from slsReceiver
2017-12-05 11:03:52 +01:00
Dhanya Maliakal
6f3898441e
merge conflict from 3.0.1 to restream stop from recieveR
2017-11-30 19:05:47 +01:00
Dhanya Maliakal
70bf6eb4cb
restream stop from receiver
2017-11-30 18:39:08 +01:00
Dhanya Maliakal
e17e4c3171
Merge branch '3.0.1' into developer
2017-11-28 18:50:27 +01:00
Dhanya Maliakal
b75985088d
twice connect bug fix in zmq
2017-11-28 18:50:18 +01:00
Dhanya Maliakal
8bba57e77d
fix to not have sls_receiver_defs in zmqSocket.h incldue
2017-11-28 16:32:15 +01:00
Dhanya Maliakal
8388d1f503
using file index from zmq
2017-11-28 14:45:48 +01:00
Dhanya Maliakal
a89847538d
merge ocnflict for white background
2017-11-28 11:29:15 +01:00
Dhanya Maliakal
a351fa8f28
switching from black to white background for receiver
2017-11-28 11:18:30 +01:00
Dhanya Maliakal
4466213882
makng the zmq work without external flag
2017-11-27 17:06:27 +01:00
Dhanya Maliakal
2c276db579
solved merge conflict in changes to use ZmqSocket.h externally
2017-11-23 16:35:31 +01:00
Dhanya Maliakal
b14ea217ee
Merge branch '3.0.1' into zmqchange
2017-11-23 16:34:14 +01:00
Dhanya Maliakal
da3ca9f306
changes to use ZmqSocket.h externally without further changes
2017-11-23 16:28:02 +01:00
Dhanya Maliakal
ad64df01c7
somewhere
2017-11-23 14:53:40 +01:00
