Browse Source

debugging using notify now

Zachary Pavlov 19 years ago
parent
commit
d21494ed39

+ 11 - 9
panda/src/nativenet/buffered_datagramconnection.h

@@ -115,7 +115,7 @@ private:
 // Argument         : void
 // Argument         : void
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 inline void Buffered_DatagramConnection::ClearAll(void) {
 inline void Buffered_DatagramConnection::ClearAll(void) {
-  printf("Buffered_DatagramConnection::ClearAll Starting Auto Reset\n");
+  nativenet_cat.error() << "Buffered_DatagramConnection::ClearAll Starting Auto Reset\n";
   Close();
   Close();
   _Writer.ReSet();
   _Writer.ReSet();
   _Reader.ReSet();
   _Reader.ReSet();
@@ -210,7 +210,8 @@ inline Buffered_DatagramConnection::~Buffered_DatagramConnection(void)
 inline Buffered_DatagramConnection::Buffered_DatagramConnection(bool do_blocking_writes, int rbufsize, int wbufsize, int write_flush_point) 
 inline Buffered_DatagramConnection::Buffered_DatagramConnection(bool do_blocking_writes, int rbufsize, int wbufsize, int write_flush_point) 
 	:  _Writer(do_blocking_writes,wbufsize,write_flush_point) , _Reader(rbufsize) 
 	:  _Writer(do_blocking_writes,wbufsize,write_flush_point) , _Reader(rbufsize) 
 {
 {
-  printf("Buffered_DatagramConnection Constructor rbufsize = %d wbufsize = %d write_flush_point = %d\n",rbufsize, wbufsize, write_flush_point);
+  nativenet_cat.error() << "Buffered_DatagramConnection Constructor rbufsize = " << rbufsize 
+                        << " wbufsize = " << wbufsize << " write_flush_point = " << write_flush_point << "\n";
 }
 }
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 // Function name	:  Buffered_DatagramConnection::SendMessage
 // Function name	:  Buffered_DatagramConnection::SendMessage
@@ -228,7 +229,7 @@ inline bool  Buffered_DatagramConnection::SendMessage(const Datagram &msg)
         
         
 	if(val >= 0)
 	if(val >= 0)
 	  return true;
 	  return true;
-	printf("Buffered_DatagramConnection::SendMessage->Error On Write--Out Buffer = %d\n",_Writer.AmountBuffered());
+	nativenet_cat.error() << "Buffered_DatagramConnection::SendMessage->Error On Write--Out Buffer = " << _Writer.AmountBuffered() << "\n";
         ClearAll();
         ClearAll();
       }
       }
       return false;
       return false;
@@ -240,7 +241,7 @@ inline bool  Buffered_DatagramConnection::SendMessageBufferOnly(Datagram &msg)
 	if(val >= 0)
 	if(val >= 0)
 	    return true;
 	    return true;
 
 
-	printf("Buffered_DatagramConnection::SendMessageBufferOnly->Error On Write--Out Buffer = %d\n",_Writer.AmountBuffered());
+	nativenet_cat.error() << "Buffered_DatagramConnection::SendMessageBufferOnly->Error On Write--Out Buffer = " _Writer.AmountBuffered() << "\n";
 	ClearAll();
 	ClearAll();
     return false;
     return false;
 }
 }
@@ -278,7 +279,7 @@ inline bool Buffered_DatagramConnection::GetMessage(Datagram  &val)
     if(ans1 == 0)
     if(ans1 == 0)
       return false;
       return false;
     if(ans1 <0) {
     if(ans1 <0) {
-      printf("Buffered_DatagramConnection::GetMessage->Error On PumpMessageReader--Out Buffer = %d\n",_Writer.AmountBuffered());
+      nativenet_cat.error() << "Buffered_DatagramConnection::GetMessage->Error On PumpMessageReader--Out Buffer = " << _Writer.AmountBuffered() << "\n";
       ClearAll();
       ClearAll();
       return false;
       return false;
     }
     }
@@ -301,8 +302,9 @@ bool Buffered_DatagramConnection::Flush(void)
         int flush_resp = _Writer.FlushNoBlock(*this);
         int flush_resp = _Writer.FlushNoBlock(*this);
 		if(flush_resp < 0)
 		if(flush_resp < 0)
 		{
 		{
-                        printf("Buffered_DatagramConnection::Flush->Error On Flush [%d]\n",GetLastError());
-		        printf("Buffered_DatagramConnection::Flush->Error ..Write--Out Buffer = %d\n",_Writer.AmountBuffered());
+                  nativenet_cat.error() << "Buffered_DatagramConnection::Flush->Error On Flush [" <<GetLastError() << "]\n" 
+
+                                       << "Buffered_DatagramConnection::Flush->Error ..Write--Out Buffer = " << _Writer.AmountBuffered() << "\n";
 			ClearAll();  
 			ClearAll();  
 			return false;
 			return false;
 		}
 		}
@@ -319,8 +321,8 @@ bool Buffered_DatagramConnection::Flush(void)
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 inline void Buffered_DatagramConnection::Reset()
 inline void Buffered_DatagramConnection::Reset()
 {
 {
-    printf("Buffered_DatagramConnection::Reset()\n");
-    ClearAll();
+  nativenet_cat.error() << "Buffered_DatagramConnection::Reset()\n";
+  ClearAll();`
 };
 };
 
 
 
 

+ 3 - 3
panda/src/nativenet/buffered_datagramreader.h

@@ -60,7 +60,7 @@ public:
                 if(!sck.ErrorIs_WouldBlocking(gotbytes) )
                 if(!sck.ErrorIs_WouldBlocking(gotbytes) )
                 {
                 {
                     answer = -3;  // hard error ?
                     answer = -3;  // hard error ?
-                    printf("buffered_datagram_reader:ReadPump socket read error -- %d, %s\n", GETERROR(),  sck.GetPeerName().get_ip_port().c_str());
+                    nativenet_cat.error() << "buffered_datagram_reader:ReadPump socket read error -- " << GETERROR() <<", " <<  sck.GetPeerName().get_ip_port().c_str() << "\n";
                 }
                 }
                 else
                 else
                 {
                 {
@@ -76,13 +76,13 @@ public:
             else   // 0 mean other end disconect arggggg
             else   // 0 mean other end disconect arggggg
             {
             {
                 answer = -1;
                 answer = -1;
-                printf("buffered_datagram_reader:ReadPump other end of socket closed -- %s\n",  sck.GetPeerName().get_ip_port().c_str());
+                nativenet_cat.error() << "buffered_datagram_reader:ReadPump other end of socket closed -- " <<  sck.GetPeerName().get_ip_port().c_str() << "\n";
             }
             }
         }		
         }		
         else
         else
         {
         {
             answer = -2;
             answer = -2;
-            printf("buffered_datagram_reader:ReadPump Yeep! buffer has no room to read to -- %s\nBufferAvaiable = %d, AmountBuffered = %d, BufferSize = %d\n", sck.GetPeerName().get_ip_port().c_str(), readsize, AmountBuffered(), GetBufferSize());
+            nativenet_cat.error() << "buffered_datagram_reader:ReadPump Yeep! buffer has no room to read to -- " << sck.GetPeerName().get_ip_port().c_str() << "\nBufferAvaiable = " << readsize " AmountBuffered = " << AmountBuffered() << " BufferSize " << GetBufferSize() << "\n";
             
             
         }
         }
         return answer;
         return answer;