From 500ed354f0716707a0d8539959a41cbf7d0e1b24 Mon Sep 17 00:00:00 2001
From: Mohacsi Istvan <mohacsi_i@sls-test-009.psi.ch>
Date: Fri, 25 Jun 2021 17:16:53 +0200
Subject: [PATCH] Stuff

---
 jfj-combined/src/JfjFrameWorker.cpp | 8 +++++++-
 jfj-combined/src/main.cpp           | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jfj-combined/src/JfjFrameWorker.cpp b/jfj-combined/src/JfjFrameWorker.cpp
index dbdd0e0..73d676d 100644
--- a/jfj-combined/src/JfjFrameWorker.cpp
+++ b/jfj-combined/src/JfjFrameWorker.cpp
@@ -20,7 +20,7 @@ JfjFrameWorker::~JfjFrameWorker() {
 
 
 inline uint64_t JfjFrameWorker::process_packets(BufferBinaryFormat& buffer){
-    // std::cout << "  Called process_packets()" << std::endl;
+    //std::cout << "  Called process_packets()" << std::endl;
 
     while(!m_buffer.is_empty()){
         // Happens if the last packet from the previous frame gets lost.
@@ -36,6 +36,8 @@ inline uint64_t JfjFrameWorker::process_packets(BufferBinaryFormat& buffer){
         jfjoch_packet_t& c_packet = m_buffer.pop_front();
         m_frame_index = c_packet.framenum;
         this->in_progress = true;
+        //std::cout << "    ff: " << c_packet.framenum << std::endl;
+        //std::cout << "    ex: " << c_packet.exptime << std::endl;
         //std::cout << "    pp: " << c_packet.packetnum << std::endl;
 
         // Always copy metadata (otherwise problem when 0th packet gets lost)
@@ -62,12 +64,14 @@ inline uint64_t JfjFrameWorker::process_packets(BufferBinaryFormat& buffer){
 }
 
 uint64_t JfjFrameWorker::get_frame(BufferBinaryFormat& buffer){
+    //std::cout << "Called get_frame()" << std::endl;
     // std::cout << "Called get_frame()" << std::endl;
     // Reset the metadata and frame buffer for the next frame. (really needed?)
     memset(&buffer, 0, sizeof(buffer));
 
     // Process leftover packages in the buffer
     if (!m_buffer.is_empty()) {
+        //std::cout << "Leftovers" << std::endl;
         auto pulse_id = process_packets(buffer);
         if (pulse_id != 0) { return pulse_id; }
     }
@@ -75,8 +79,10 @@ uint64_t JfjFrameWorker::get_frame(BufferBinaryFormat& buffer){
 
     while (true) {
         // Receive new packages (pass if none)...
+        //std::cout << "New packages" << std::endl;
         m_buffer.fill_from(m_udp_receiver);
         if (m_buffer.is_empty()) { continue; }
+        std::cout << "\tGot " << m_buffer.size() << std::endl;
 
         // ... and process them
         auto pulse_id = process_packets(buffer);
diff --git a/jfj-combined/src/main.cpp b/jfj-combined/src/main.cpp
index f2ecd7b..d062297 100644
--- a/jfj-combined/src/main.cpp
+++ b/jfj-combined/src/main.cpp
@@ -22,8 +22,8 @@ int main (int argc, char *argv[]) {
 
     std::cout << "Creating workers..." << std::endl;
     JfjFrameWorker W0(5005, 0, push_cb);
-    JfjFrameWorker W1(5006, 1, push_cb);
-    JfjFrameWorker W2(5007, 2, push_cb);
+    //JfjFrameWorker W1(5006, 1, push_cb);
+    // JfjFrameWorker W2(5007, 2, push_cb);
 
     std::thread T0(&JfjFrameWorker::run, &W0);