Use LOG_* macros in all classes except packet processors

christiankerl · xlz · commit 81e115178ce3 · 2015-09-03T13:01:30.000-04:00
diff --git a/examples/protonect/include/libfreenect2/depth_packet_stream_parser.h b/examples/protonect/include/libfreenect2/depth_packet_stream_parser.h
@@ -31,6 +31,7 @@
 #include <stdint.h>
 
 #include <libfreenect2/config.h>
+#include <libfreenect2/logging.h>
 
 #include <libfreenect2/double_buffer.h>
 #include <libfreenect2/depth_packet_processor.h>
@@ -51,7 +52,7 @@ LIBFREENECT2_PACK(struct LIBFREENECT2_API DepthSubPacketFooter
   uint32_t fields[32];
 });
 
-class LIBFREENECT2_API DepthPacketStreamParser : public DataCallback
+class LIBFREENECT2_API DepthPacketStreamParser : public DataCallback, public WithLoggerImpl
 {
 public:
   DepthPacketStreamParser();
diff --git a/examples/protonect/include/libfreenect2/logging.h b/examples/protonect/include/libfreenect2/logging.h
@@ -81,6 +81,16 @@ class LIBFREENECT2_API WithLogger
   virtual Logger *logger() = 0;
 };
 
+template<class T>
+void trySetLogger(T *obj, Logger *logger)
+{
+  WithLogger *obj_with_logger = dynamic_cast<WithLogger *>(obj);
+  if(obj_with_logger != 0)
+  {
+    obj_with_logger->setLogger(logger);
+  }
+}
+
 class LIBFREENECT2_API WithLoggerImpl : public WithLogger
 {
 protected:
diff --git a/examples/protonect/include/libfreenect2/packet_pipeline.h b/examples/protonect/include/libfreenect2/packet_pipeline.h
@@ -28,6 +28,7 @@
 #define PACKET_PIPELINE_H_
 
 #include <libfreenect2/config.h>
+#include <libfreenect2/logging.h>
 #include <libfreenect2/data_callback.h>
 #include <libfreenect2/rgb_packet_stream_parser.h>
 #include <libfreenect2/depth_packet_stream_parser.h>
@@ -50,7 +51,7 @@ class LIBFREENECT2_API PacketPipeline
   virtual DepthPacketProcessor *getDepthPacketProcessor() const = 0;
 };
 
-class LIBFREENECT2_API BasePacketPipeline : public PacketPipeline
+class LIBFREENECT2_API BasePacketPipeline : public PacketPipeline, public WithLoggerImpl
 {
 protected:
   RgbPacketStreamParser *rgb_parser_;
@@ -63,6 +64,8 @@ class LIBFREENECT2_API BasePacketPipeline : public PacketPipeline
 
   virtual void initialize();
   virtual DepthPacketProcessor *createDepthPacketProcessor() = 0;
+
+  virtual void onLoggerChanged(Logger *logger);
 public:
   virtual ~BasePacketPipeline();
 
diff --git a/examples/protonect/include/libfreenect2/protocol/command_transaction.h b/examples/protonect/include/libfreenect2/protocol/command_transaction.h
@@ -28,14 +28,15 @@
 #define COMMAND_TRANSACTION_H_
 
 #include <libusb.h>
+#include <libfreenect2/logging.h>
 #include <libfreenect2/protocol/command.h>
 
 namespace libfreenect2
 {
 namespace protocol
 {
 
-class CommandTransaction
+class CommandTransaction : public WithLoggerImpl
 {
 public:
   static const int ResponseCompleteLength = 16;
@@ -63,7 +64,7 @@ class CommandTransaction
   };
 
   CommandTransaction(libusb_device_handle *handle, int inbound_endpoint, int outbound_endpoint);
-  ~CommandTransaction();
+  virtual ~CommandTransaction();
 
   void execute(const CommandBase& command, Result& result);
 private:
diff --git a/examples/protonect/include/libfreenect2/protocol/usb_control.h b/examples/protonect/include/libfreenect2/protocol/usb_control.h
@@ -28,6 +28,7 @@
 #define USB_CONTROL_H_
 
 #include <libusb.h>
+#include <libfreenect2/logging.h>
 
 namespace libfreenect2
 {
@@ -61,7 +62,7 @@ namespace protocol
  *
  * The 2. interface can be enabled/disabled by changing its alternate setting to 1/0
  */
-class UsbControl
+class UsbControl : public WithLoggerImpl
 {
 public:
   UsbControl(libusb_device_handle *handle);
diff --git a/examples/protonect/include/libfreenect2/rgb_packet_stream_parser.h b/examples/protonect/include/libfreenect2/rgb_packet_stream_parser.h
@@ -30,6 +30,7 @@
 #include <stddef.h>
 
 #include <libfreenect2/config.h>
+#include <libfreenect2/logging.h>
 #include <libfreenect2/double_buffer.h>
 #include <libfreenect2/rgb_packet_processor.h>
 
@@ -38,7 +39,7 @@
 namespace libfreenect2
 {
 
-class LIBFREENECT2_API RgbPacketStreamParser : public DataCallback
+class LIBFREENECT2_API RgbPacketStreamParser : public DataCallback, public WithLoggerImpl
 {
 public:
   RgbPacketStreamParser();
diff --git a/examples/protonect/include/libfreenect2/usb/transfer_pool.h b/examples/protonect/include/libfreenect2/usb/transfer_pool.h
@@ -30,6 +30,7 @@
 #include <vector>
 #include <libusb.h>
 
+#include <libfreenect2/logging.h>
 #include <libfreenect2/data_callback.h>
 #include <libfreenect2/threading.h>
 
@@ -39,7 +40,7 @@ namespace libfreenect2
 namespace usb
 {
 
-class TransferPool
+class TransferPool : public WithLoggerImpl
 {
 public:
   TransferPool(libusb_device_handle *device_handle, unsigned char device_endpoint);
diff --git a/examples/protonect/src/command_transaction.cpp b/examples/protonect/src/command_transaction.cpp
@@ -27,7 +27,6 @@
 #include <libfreenect2/protocol/command_transaction.h>
 
 #include <stdint.h>
-#include <iostream>
 
 namespace libfreenect2
 {
@@ -106,7 +105,7 @@ void CommandTransaction::execute(const CommandBase& command, Result& result)
 
     if(complete)
     {
-      std::cerr << "[CommandTransaction::execute] received premature response complete!" << std::endl;
+      LOG_ERROR << "received premature response complete!";
       result.code = Error;
     }
 
@@ -119,7 +118,7 @@ void CommandTransaction::execute(const CommandBase& command, Result& result)
 
   if(!complete)
   {
-    std::cerr << "[CommandTransaction::execute] missing response complete!" << std::endl;
+    LOG_ERROR << "missing response complete!";
     result.code = Error;
   }
 
@@ -135,13 +134,13 @@ CommandTransaction::ResultCode CommandTransaction::send(const CommandBase& comma
 
   if(r != LIBUSB_SUCCESS)
   {
-    std::cerr << "[CommandTransaction::send] bulk transfer failed! libusb error " << r << ": " << libusb_error_name(r) << std::endl;
+    LOG_ERROR << "bulk transfer failed! libusb error " << r << ": " << libusb_error_name(r);
     code = Error;
   }
 
   if(transferred_bytes != command.size())
   {
-    std::cerr << "[CommandTransaction::send] sent number of bytes differs from expected number! expected: " << command.size() << " got: " << transferred_bytes << std::endl;
+    LOG_ERROR << "sent number of bytes differs from expected number! expected: " << command.size() << " got: " << transferred_bytes;
     code = Error;
   }
 
@@ -157,7 +156,7 @@ void CommandTransaction::receive(CommandTransaction::Result& result)
 
   if(r != LIBUSB_SUCCESS)
   {
-    std::cerr << "[CommandTransaction::receive] bulk transfer failed! libusb error " << r << ": " << libusb_error_name(r) << std::endl;
+    LOG_ERROR << "bulk transfer failed! libusb error " << r << ": " << libusb_error_name(r);
     result.code = Error;
   }
 }
@@ -176,7 +175,7 @@ bool CommandTransaction::isResponseCompleteResult(CommandTransaction::Result& re
 
       if(data[1] != sequence)
       {
-        std::cerr << "[CommandTransaction::isResponseCompleteResult] response complete with wrong sequence number! expected: " << sequence << " got: " << data[1]<< std::endl;
+        LOG_ERROR << "response complete with wrong sequence number! expected: " << sequence << " got: " << data[1];
       }
     }
   }
diff --git a/examples/protonect/src/depth_packet_stream_parser.cpp b/examples/protonect/src/depth_packet_stream_parser.cpp
@@ -25,7 +25,6 @@
  */
 
 #include <libfreenect2/depth_packet_stream_parser.h>
-#include <iostream>
 #include <memory.h>
 
 namespace libfreenect2
@@ -79,7 +78,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
 
     if(wb.length + in_length > wb.capacity)
     {
-      std::cerr << "[DepthPacketStreamParser::onDataReceived] subpacket too large" << std::endl;
+      LOG_ERROR << "subpacket too large";
       wb.length = 0;
       return;
     }
@@ -91,7 +90,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
     {
       if(footer->length != wb.length)
       {
-        std::cerr << "[DepthPacketStreamParser::onDataReceived] image data too short!" << std::endl;
+        LOG_ERROR << "image data too short!";
       }
       else
       {
@@ -113,12 +112,12 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
             }
             else
             {
-              std::cerr << "[DepthPacketStreamParser::onDataReceived] skipping depth packet" << std::endl;
+              LOG_WARNING << "skipping depth packet";
             }
           }
           else
           {
-            std::cerr << "[DepthPacketStreamParser::onDataReceived] not all subsequences received " << current_subsequence_ << std::endl;
+            LOG_ERROR << "not all subsequences received " << current_subsequence_;
           }
 
           current_sequence_ = footer->sequence;
@@ -132,7 +131,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le
 
         if(footer->subsequence * footer->length > fb.length)
         {
-          std::cerr << "[DepthPacketStreamParser::onDataReceived] front buffer too short! subsequence number is " << footer->subsequence << std::endl;
+          LOG_ERROR << "front buffer too short! subsequence number is " << footer->subsequence;
         }
         else
         {
diff --git a/examples/protonect/src/libfreenect2.cpp b/examples/protonect/src/libfreenect2.cpp
@@ -74,6 +74,8 @@ class Freenect2DeviceImpl : public Freenect2Device, public WithLoggerImpl
   std::string serial_, firmware_;
   Freenect2Device::IrCameraParams ir_camera_params_;
   Freenect2Device::ColorCameraParams rgb_camera_params_;
+protected:
+  virtual void onLoggerChanged(Logger *logger);
 public:
   Freenect2DeviceImpl(Freenect2Impl *context, const PacketPipeline *pipeline, libusb_device *usb_device, libusb_device_handle *usb_device_handle, const std::string &serial);
   virtual ~Freenect2DeviceImpl();
@@ -364,6 +366,17 @@ Freenect2DeviceImpl::~Freenect2DeviceImpl()
   delete pipeline_;
 }
 
+void Freenect2DeviceImpl::onLoggerChanged(Logger *logger)
+{
+  rgb_transfer_pool_.setLogger(logger);
+  ir_transfer_pool_.setLogger(logger);
+  usb_control_.setLogger(logger);
+  command_tx_.setLogger(logger);
+
+  // TODO: is this ok?
+  trySetLogger(const_cast<PacketPipeline *>(pipeline_), logger);
+}
+
 int Freenect2DeviceImpl::nextCommandSeq()
 {
   return command_seq_++;
diff --git a/examples/protonect/src/packet_pipeline.cpp b/examples/protonect/src/packet_pipeline.cpp
@@ -49,6 +49,14 @@ void BasePacketPipeline::initialize()
   depth_parser_->setPacketProcessor(async_depth_processor_);
 }
 
+void BasePacketPipeline::onLoggerChanged(Logger *logger)
+{
+  rgb_parser_->setLogger(logger);
+  depth_parser_->setLogger(logger);
+  trySetLogger(rgb_processor_, logger);
+  trySetLogger(depth_processor_, logger);
+}
+
 BasePacketPipeline::~BasePacketPipeline()
 {
   delete async_rgb_processor_;
diff --git a/examples/protonect/src/rgb_packet_stream_parser.cpp b/examples/protonect/src/rgb_packet_stream_parser.cpp
@@ -27,7 +27,6 @@
 #include <libfreenect2/config.h>
 #include <libfreenect2/rgb_packet_stream_parser.h>
 #include <memory.h>
-#include <iostream>
 
 namespace libfreenect2
 {
@@ -88,7 +87,7 @@ void RgbPacketStreamParser::onDataReceived(unsigned char* buffer, size_t length)
     }
     else
     {
-      std::cerr << "[RgbPacketStreamParser::onDataReceived] buffer overflow!" << std::endl;
+      LOG_ERROR << "buffer overflow!";
       fb.length = 0;
       return;
     }
@@ -105,14 +104,14 @@ void RgbPacketStreamParser::onDataReceived(unsigned char* buffer, size_t length)
 
       if (fb.length != footer->packet_size || raw_packet->sequence != footer->sequence)
       {
-        std::cerr << "[RgbPacketStreamParser::onDataReceived] packetsize or sequence doesn't match!" << std::endl;
+        LOG_ERROR << "packetsize or sequence doesn't match!";
         fb.length = 0;
         return;
       }
 
       if (fb.length - sizeof(RawRgbPacket) - sizeof(RgbPacketFooter) < footer->filler_length)
       {
-        std::cerr << "[RgbPacketStreamParser::onDataReceived] not enough space for packet filler!" << std::endl;
+        LOG_ERROR << "not enough space for packet filler!";
         fb.length = 0;
         return;
       }
@@ -132,7 +131,7 @@ void RgbPacketStreamParser::onDataReceived(unsigned char* buffer, size_t length)
 
       if (jpeg_length == 0)
       {
-        std::cerr << "[RgbPacketStreamParser::onDataReceived] no JPEG detected!" << std::endl;
+        LOG_ERROR << "no JPEG detected!";
         fb.length = 0;
         return;
       }
@@ -155,7 +154,7 @@ void RgbPacketStreamParser::onDataReceived(unsigned char* buffer, size_t length)
       }
       else
       {
-        std::cerr << "[RgbPacketStreamParser::onDataReceived] skipping rgb packet!" << std::endl;
+        LOG_WARNING << "skipping rgb packet!";
       }
 
       // reset front buffer
diff --git a/examples/protonect/src/transfer_pool.cpp b/examples/protonect/src/transfer_pool.cpp
diff --git a/examples/protonect/src/usb_control.cpp b/examples/protonect/src/usb_control.cpp

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`#define USB_CONTROL_H_`
`29`	`29`
`30`	`30`	`#include <libusb.h>`
	`31`	`+#include <libfreenect2/logging.h>`
`31`	`32`
`32`	`33`	`namespace libfreenect2`
`33`	`34`	`{`
`@@ -61,7 +62,7 @@ namespace protocol`
`61`	`62`	`*`
`62`	`63`	`* The 2. interface can be enabled/disabled by changing its alternate setting to 1/0`
`63`	`64`	`*/`
`64`		`-class UsbControl`
	`65`	`+class UsbControl : public WithLoggerImpl`
`65`	`66`	`{`
`66`	`67`	`public:`
`67`	`68`	`UsbControl(libusb_device_handle *handle);`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`#include <stddef.h>`
`31`	`31`
`32`	`32`	`#include <libfreenect2/config.h>`
	`33`	`+#include <libfreenect2/logging.h>`
`33`	`34`	`#include <libfreenect2/double_buffer.h>`
`34`	`35`	`#include <libfreenect2/rgb_packet_processor.h>`
`35`	`36`
`@@ -38,7 +39,7 @@`
`38`	`39`	`namespace libfreenect2`
`39`	`40`	`{`
`40`	`41`
`41`		`-class LIBFREENECT2_API RgbPacketStreamParser : public DataCallback`
	`42`	`+class LIBFREENECT2_API RgbPacketStreamParser : public DataCallback, public WithLoggerImpl`
`42`	`43`	`{`
`43`	`44`	`public:`
`44`	`45`	`RgbPacketStreamParser();`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`#include <libfreenect2/protocol/command_transaction.h>`
`28`	`28`
`29`	`29`	`#include <stdint.h>`
`30`		`-#include <iostream>`
`31`	`30`
`32`	`31`	`namespace libfreenect2`
`33`	`32`	`{`
`@@ -106,7 +105,7 @@ void CommandTransaction::execute(const CommandBase& command, Result& result)`
`106`	`105`
`107`	`106`	`if(complete)`
`108`	`107`	`{`
`109`		`- std::cerr << "[CommandTransaction::execute] received premature response complete!" << std::endl;`
	`108`	`+ LOG_ERROR << "received premature response complete!";`
`110`	`109`	`result.code = Error;`
`111`	`110`	`}`
`112`	`111`
`@@ -119,7 +118,7 @@ void CommandTransaction::execute(const CommandBase& command, Result& result)`
`119`	`118`
`120`	`119`	`if(!complete)`
`121`	`120`	`{`
`122`		`- std::cerr << "[CommandTransaction::execute] missing response complete!" << std::endl;`
	`121`	`+ LOG_ERROR << "missing response complete!";`
`123`	`122`	`result.code = Error;`
`124`	`123`	`}`
`125`	`124`
`@@ -135,13 +134,13 @@ CommandTransaction::ResultCode CommandTransaction::send(const CommandBase& comma`
`135`	`134`
`136`	`135`	`if(r != LIBUSB_SUCCESS)`
`137`	`136`	`{`
`138`		`- std::cerr << "[CommandTransaction::send] bulk transfer failed! libusb error " << r << ": " << libusb_error_name(r) << std::endl;`
	`137`	`+ LOG_ERROR << "bulk transfer failed! libusb error " << r << ": " << libusb_error_name(r);`
`139`	`138`	`code = Error;`
`140`	`139`	`}`
`141`	`140`
`142`	`141`	`if(transferred_bytes != command.size())`
`143`	`142`	`{`
`144`		`- std::cerr << "[CommandTransaction::send] sent number of bytes differs from expected number! expected: " << command.size() << " got: " << transferred_bytes << std::endl;`
	`143`	`+ LOG_ERROR << "sent number of bytes differs from expected number! expected: " << command.size() << " got: " << transferred_bytes;`
`145`	`144`	`code = Error;`
`146`	`145`	`}`
`147`	`146`
`@@ -157,7 +156,7 @@ void CommandTransaction::receive(CommandTransaction::Result& result)`
`157`	`156`
`158`	`157`	`if(r != LIBUSB_SUCCESS)`
`159`	`158`	`{`
`160`		`- std::cerr << "[CommandTransaction::receive] bulk transfer failed! libusb error " << r << ": " << libusb_error_name(r) << std::endl;`
	`159`	`+ LOG_ERROR << "bulk transfer failed! libusb error " << r << ": " << libusb_error_name(r);`
`161`	`160`	`result.code = Error;`
`162`	`161`	`}`
`163`	`162`	`}`
`@@ -176,7 +175,7 @@ bool CommandTransaction::isResponseCompleteResult(CommandTransaction::Result& re`
`176`	`175`
`177`	`176`	`if(data[1] != sequence)`
`178`	`177`	`{`
`179`		`- std::cerr << "[CommandTransaction::isResponseCompleteResult] response complete with wrong sequence number! expected: " << sequence << " got: " << data[1]<< std::endl;`
	`178`	`+ LOG_ERROR << "response complete with wrong sequence number! expected: " << sequence << " got: " << data[1];`
`180`	`179`	`}`
`181`	`180`	`}`
`182`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`*/`
`26`	`26`
`27`	`27`	`#include <libfreenect2/depth_packet_stream_parser.h>`
`28`		`-#include <iostream>`
`29`	`28`	`#include <memory.h>`
`30`	`29`
`31`	`30`	`namespace libfreenect2`
`@@ -79,7 +78,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le`
`79`	`78`
`80`	`79`	`if(wb.length + in_length > wb.capacity)`
`81`	`80`	`{`
`82`		`- std::cerr << "[DepthPacketStreamParser::onDataReceived] subpacket too large" << std::endl;`
	`81`	`+ LOG_ERROR << "subpacket too large";`
`83`	`82`	`wb.length = 0;`
`84`	`83`	`return;`
`85`	`84`	`}`
`@@ -91,7 +90,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le`
`91`	`90`	`{`
`92`	`91`	`if(footer->length != wb.length)`
`93`	`92`	`{`
`94`		`- std::cerr << "[DepthPacketStreamParser::onDataReceived] image data too short!" << std::endl;`
	`93`	`+ LOG_ERROR << "image data too short!";`
`95`	`94`	`}`
`96`	`95`	`else`
`97`	`96`	`{`
`@@ -113,12 +112,12 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le`
`113`	`112`	`}`
`114`	`113`	`else`
`115`	`114`	`{`
`116`		`- std::cerr << "[DepthPacketStreamParser::onDataReceived] skipping depth packet" << std::endl;`
	`115`	`+ LOG_WARNING << "skipping depth packet";`
`117`	`116`	`}`
`118`	`117`	`}`
`119`	`118`	`else`
`120`	`119`	`{`
`121`		`- std::cerr << "[DepthPacketStreamParser::onDataReceived] not all subsequences received " << current_subsequence_ << std::endl;`
	`120`	`+ LOG_ERROR << "not all subsequences received " << current_subsequence_;`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`current_sequence_ = footer->sequence;`
`@@ -132,7 +131,7 @@ void DepthPacketStreamParser::onDataReceived(unsigned char* buffer, size_t in_le`
`132`	`131`
`133`	`132`	`if(footer->subsequence * footer->length > fb.length)`
`134`	`133`	`{`
`135`		`- std::cerr << "[DepthPacketStreamParser::onDataReceived] front buffer too short! subsequence number is " << footer->subsequence << std::endl;`
	`134`	`+ LOG_ERROR << "front buffer too short! subsequence number is " << footer->subsequence;`
`136`	`135`	`}`
`137`	`136`	`else`
`138`	`137`	`{`