Integrated the zmq 'compression' in the ix code + fixes.
Added cmake detection for dolphin. Currently the cmake is hardcoded for an IX adapter and the sisci library. Added ix_fb_rcv and zmq_rcv_ix_xmit as cmake built targets. Updated the ix_stream/zmq_stream makefiles to use the zmq_transport files. Minor changes to make sure that zmq_fe/zmq_thread/zmq_rcv_ix_xmit/ix_fb_rcv populate headers and lay out data in the same way. Added test code to ix_fb_rcv to read data from an mbuf instead of dolphin to allow debugging on a non-dolphin system. -B sets the source mbuf name. Allowed added the -b flag to zmq_rcv_ix_xmit/ix_fb_rcv to allow overriding the mbuf that is used. Found that ix_fb_rcv was always copying the 1st buffer/stride/cycle from the daq_multi_cycle_data_t structure in the dolphin, fixed it to push out the cycle it was claiming to copy over. git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@4726 6dcd42c9-f523-4c6d-aada-af552506706e
Showing
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- config/cmake/FindDolphin.cmake 53 additions, 0 deletionsconfig/cmake/FindDolphin.cmake
- src/CMakeLists.txt 4 additions, 1 deletionsrc/CMakeLists.txt
- src/ix_stream/CMakeLists.txt 8 additions, 0 deletionssrc/ix_stream/CMakeLists.txt
- src/ix_stream/Makefile 4 additions, 3 deletionssrc/ix_stream/Makefile
- src/ix_stream/ix_fb_rcv.c 43 additions, 17 deletionssrc/ix_stream/ix_fb_rcv.c
- src/ix_stream/zmq_rcv_ix_xmit.c 55 additions, 40 deletionssrc/ix_stream/zmq_rcv_ix_xmit.c
- src/zmq_stream/CMakeLists.txt 1 addition, 0 deletionssrc/zmq_stream/CMakeLists.txt
- src/zmq_stream/Makefile 5 additions, 2 deletionssrc/zmq_stream/Makefile
- src/zmq_stream/zmq_threads.c 3 additions, 3 deletionssrc/zmq_stream/zmq_threads.c
Loading
Please register or sign in to comment