[complement-svn] SF.net SVN: complement: [1752] trunk/complement/explore

[<com...@us...>]

Revision: 1752
          http://complement.svn.sourceforge.net/complement/?rev=1752&view=rev
Author:   complement
Date:     2007-10-01 02:13:22 -0700 (Mon, 01 Oct 2007)

Log Message:
-----------
comment NetTransportMP, looks it useless; add trace for NetTransport [server part];

library version 4.6.4

Modified Paths:
--------------
    trunk/complement/explore/include/stem/NetTransport.h
    trunk/complement/explore/lib/stem/ChangeLog
    trunk/complement/explore/lib/stem/Makefile.inc
    trunk/complement/explore/lib/stem/NetTransport.cc

Modified: trunk/complement/explore/include/stem/NetTransport.h
===================================================================
--- trunk/complement/explore/include/stem/NetTransport.h	2007-09-28 11:03:56 UTC (rev 1751)
+++ trunk/complement/explore/include/stem/NetTransport.h	2007-10-01 09:13:22 UTC (rev 1752)
@@ -112,6 +112,7 @@
     std::sockstream _channel;
 };
 
+#if 0
 class NetTransportMP :
     public NetTransport_base
 {
@@ -123,6 +124,7 @@
     __FIT_DECLSPEC
     void connect( std::sockstream& );
 };
+#endif
 
 } // namespace stem
 

Modified: trunk/complement/explore/lib/stem/ChangeLog
===================================================================
--- trunk/complement/explore/lib/stem/ChangeLog	2007-09-28 11:03:56 UTC (rev 1751)
+++ trunk/complement/explore/lib/stem/ChangeLog	2007-10-01 09:13:22 UTC (rev 1752)
@@ -1,3 +1,10 @@
+2007-10-01  Petr Ovtchenkov  <pt...@is...>
+
+	* NetTransport.h, NetTransport.cc: comment NetTransportMP,
+	looks it useless; add trace for NetTransport [server part];
+
+	* libstem: library version 4.6.4
+
 2007-09-05  Petr Ovtchenkov  <pt...@is...>
 
 	* Cron.h, NetTransport.h, EvManager.h: looks like non-POD return

Modified: trunk/complement/explore/lib/stem/Makefile.inc
===================================================================
--- trunk/complement/explore/lib/stem/Makefile.inc	2007-09-28 11:03:56 UTC (rev 1751)
+++ trunk/complement/explore/lib/stem/Makefile.inc	2007-10-01 09:13:22 UTC (rev 1752)
@@ -3,7 +3,7 @@
 LIBNAME = stem
 MAJOR = 4
 MINOR = 6
-PATCH = 3
+PATCH = 4
 SRC_CC = _EventHandler.cc NetTransport.cc EvManager.cc EvPack.cc crc.cc \
          Names.cc Cron.cc
 

Modified: trunk/complement/explore/lib/stem/NetTransport.cc
===================================================================
--- trunk/complement/explore/lib/stem/NetTransport.cc	2007-09-28 11:03:56 UTC (rev 1751)
+++ trunk/complement/explore/lib/stem/NetTransport.cc	2007-10-01 09:13:22 UTC (rev 1752)
@@ -303,8 +303,33 @@
     gaddr_type src;
 
     if ( pop( ev, dst, src ) ) {
+#ifdef __FIT_STEM_TRACE
+      try {
+        xmt::scoped_lock lk(manager()->_lock_tr);
+        if ( manager()->_trs != 0 && manager()->_trs->good() && (manager()->_trflags & EvManager::tracenet) ) {
+          *manager()->_trs << "Pid/ppid: " << xmt::getpid() << "/" << xmt::getppid() << "\n";
+          manager()->dump( *manager()->_trs ) << endl;
+        }
+      }
+      catch ( ... ) {
+      }
+#endif // __FIT_STEM_TRACE
       addr_type xdst = manager()->reflect( dst );
       if ( xdst == badaddr ) {
+#ifdef __FIT_STEM_TRACE
+        try {
+          xmt::scoped_lock lk(manager()->_lock_tr);
+          if ( manager()->_trs != 0 && manager()->_trs->good() && (manager()->_trflags & (EvManager::tracefault)) ) {
+            *manager()->_trs << __FILE__ << ":" << __LINE__
+                             << " ("
+                             << xmt::getpid() << "/" << xmt::getppid() << ") "
+                             << "Unknown destination\n";
+            manager()->dump( *manager()->_trs ) << endl;
+          }
+        }
+        catch ( ... ) {
+        }
+#endif // __FIT_STEM_TRACE
         return;
       }
       ev.dest( xdst );
@@ -314,6 +339,16 @@
       } else {
         ev.src( xsrc );
       }
+#ifdef __FIT_STEM_TRACE
+      try {
+        xmt::scoped_lock lk(manager()->_lock_tr);
+        if ( manager()->_trs != 0 && manager()->_trs->good() && (manager()->_trflags & (EvManager::tracenet)) ) {
+          *manager()->_trs << __FILE__ << ":" << __LINE__ << endl;
+        }
+      }
+      catch ( ... ) {
+      }
+#endif // __FIT_STEM_TRACE
       manager()->push( ev );
     }
   }
@@ -505,6 +540,7 @@
   return 0;
 }
 
+#if 0
 __FIT_DECLSPEC
 void NetTransportMP::connect( sockstream& s )
 {
@@ -514,8 +550,35 @@
 
   try {
     if ( pop( ev, dst, src ) ) {
+#ifdef __FIT_STEM_TRACE
+      try {
+        xmt::scoped_lock lk(manager()->_lock_tr);
+        if ( manager()->_trs != 0 && manager()->_trs->good() && (manager()->_trflags & E
+vManager::tracenet) ) {
+          *manager()->_trs << "Pid/ppid: " << xmt::getpid() << "/" << xmt::getppid() <<
+"\n";
+          manager()->dump( *manager()->_trs ) << endl;
+        }
+      }
+      catch ( ... ) {
+      }
+#endif // __FIT_STEM_TRACE
       addr_type xdst = manager()->reflect( dst );
       if ( xdst == badaddr ) {
+#ifdef __FIT_STEM_TRACE
+        try {
+          xmt::scoped_lock lk(manager()->_lock_tr);
+          if ( manager()->_trs != 0 && manager()->_trs->good() && (manager()->_trflags & (EvManager::tracefault)) ) {
+            *manager()->_trs << __FILE__ << ":" << __LINE__
+                             << " ("
+                             << xmt::getpid() << "/" << xmt::getppid() << ") "
+                             << "Unknown destination\n";
+            manager()->dump( *manager()->_trs ) << endl;
+          }
+        }
+        catch ( ... ) {
+        }
+#endif // __FIT_STEM_TRACE
         return;
       }
       ev.dest( xdst );
@@ -526,6 +589,16 @@
       } else {
         ev.src( xsrc );
       }
+#ifdef __FIT_STEM_TRACE
+      try {
+        xmt::scoped_lock lk(manager()->_lock_tr);
+        if ( manager()->_trs != 0 && manager()->_trs->good() && (manager()->_trflags & (EvManager::tracenet)) ) {
+          *manager()->_trs << __FILE__ << ":" << __LINE__ << endl;
+        }
+      }
+      catch ( ... ) {
+      }
+#endif // __FIT_STEM_TRACE
       manager()->push( ev );
     }
     if ( !s.good() ) {
@@ -538,4 +611,6 @@
   }
 }
 
+#endif
+
 } // namespace stem


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.