Thread: [complement-svn] SF.net SVN: complement: [1723] trunk/complement/explore/lib/janus
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
complement-svn
|
From: <com...@us...> - 2007-09-07 10:52:23
|
Revision: 1723
http://complement.svn.sourceforge.net/complement/?rev=1723&view=rev
Author: complement
Date: 2007-09-07 03:52:21 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
fix dirname, options
Modified Paths:
--------------
trunk/complement/explore/lib/janus/Makefile
trunk/complement/explore/lib/janus/ut/Makefile
Modified: trunk/complement/explore/lib/janus/Makefile
===================================================================
--- trunk/complement/explore/lib/janus/Makefile 2007-09-05 11:10:42 UTC (rev 1722)
+++ trunk/complement/explore/lib/janus/Makefile 2007-09-07 10:52:21 UTC (rev 1723)
@@ -29,17 +29,17 @@
endif
check-release-shared: release-shared
- $(MAKE) -C test release-shared
- (cd test; ${OUTPUT_DIR}/ut_vtime) || exit 1
+ $(MAKE) -C ut release-shared
+ (cd ut; ${OUTPUT_DIR}/ut_vtime) || exit 1
check-dbg-shared: dbg-shared
- $(MAKE) -C test dbg-shared
- (cd test; ${OUTPUT_DIR_DBG}/ut_vtime) || exit 1
+ $(MAKE) -C ut dbg-shared
+ (cd ut; ${OUTPUT_DIR_DBG}/ut_vtime) || exit 1
ifndef WITHOUT_STLPORT
check-stldbg-shared: stldbg-shared
- $(MAKE) -C test stldbg-shared
- (cd test; ${OUTPUT_DIR_STLDBG}/ut_vtime) || exit 1
+ $(MAKE) -C ut stldbg-shared
+ (cd ut; ${OUTPUT_DIR_STLDBG}/ut_vtime) || exit 1
endif
depend::
Modified: trunk/complement/explore/lib/janus/ut/Makefile
===================================================================
--- trunk/complement/explore/lib/janus/ut/Makefile 2007-09-05 11:10:42 UTC (rev 1722)
+++ trunk/complement/explore/lib/janus/ut/Makefile 2007-09-07 10:52:21 UTC (rev 1723)
@@ -12,13 +12,23 @@
INCLUDES += -I${CoMT_INCLUDE_DIR} -I..
DEFS += -D__FIT_EXAM
-LDFLAGS += -L${INSTALL_LIB_DIR}
-ifdef WITHOUT_STLPORT
-LDFLAGS += -Wl,-rpath=${INSTALL_LIB_DIR}
-else
-LDFLAGS += -Wl,-rpath=${INSTALL_LIB_DIR}:${STLPORT_LIB_DIR}
+LIBEXAM_DIR = ${CoMT_DIR}/lib/exam
+LIBXMT_DIR = ${CoMT_DIR}/lib/mt
+LIBSOCKIOS_DIR = ${CoMT_DIR}/lib/sockios
+LIBSTEM_DIR = ${CoMT_DIR}/lib/stem
+
+ifeq ($(OSNAME),linux)
+
+release-shared: LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR} -L$(LIBXMT_DIR)/${OUTPUT_DIR} -L$(LIBSOCKIOS_DIR)/${OUTPUT_DIR} -L$(LIBSTEM_DIR)/${OUTPUT_DIR} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR}:$(LIBXMT_DIR)/${OUTPUT_DIR}:${LIBSOCKIOS_DIR}/${OUTPUT_DIR}:${LIBSTEM_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+
+dbg-shared: LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR_DBG} -L$(LIBXMT_DIR)/${OUTPUT_DIR_DBG} -L$(LIBSOCKIOS_DIR)/${OUTPUT_DIR_DBG} -L$(LIBSTEM_DIR)/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_DBG}:$(LIBXMT_DIR)/${OUTPUT_DIR_DBG}:${LIBSOCKIOS_DIR}/${OUTPUT_DIR_DBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
+
+ifndef WITHOUT_STLPORT
+stldbg-shared: LDSEARCH += -L${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG} -L$(LIBXMT_DIR)/${OUTPUT_DIR_STLDBG} -L$(LIBSOCKIOS_DIR)/${OUTPUT_DIR_STLDBG} -L$(LIBSTEM_DIR)/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBEXAM_DIR}/${OUTPUT_DIR_STLDBG}:$(LIBXMT_DIR)/${OUTPUT_DIR_STLDBG}:${LIBSOCKIOS_DIR}/${OUTPUT_DIR_STLDBG}:${LIBSTEM_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
endif
+endif
+
release-shared: PROJECT_LIBS = -lxmt -lsockios -lstem -lexam
dbg-shared: PROJECT_LIBS = -lxmtg -lsockiosg -lstemg -lexamg
ifndef WITHOUT_STLPORT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-09-25 14:28:41
|
Revision: 1745
http://complement.svn.sourceforge.net/complement/?rev=1745&view=rev
Author: complement
Date: 2007-09-25 07:28:38 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
trial configuration for virtual synchrony net, initial implementation
Modified Paths:
--------------
trunk/complement/explore/lib/janus/ChangeLog
Added Paths:
-----------
trunk/complement/explore/lib/janus/samples/
trunk/complement/explore/lib/janus/samples/point1/
trunk/complement/explore/lib/janus/samples/point1/Makefile
trunk/complement/explore/lib/janus/samples/point1/Makefile.inc
trunk/complement/explore/lib/janus/samples/point1/point1.cc
Modified: trunk/complement/explore/lib/janus/ChangeLog
===================================================================
--- trunk/complement/explore/lib/janus/ChangeLog 2007-09-25 14:25:16 UTC (rev 1744)
+++ trunk/complement/explore/lib/janus/ChangeLog 2007-09-25 14:28:38 UTC (rev 1745)
@@ -8,8 +8,11 @@
* lib/janus/ut/vt_operations.h, lib/janus/ut/vt_remote.cc: ditto;
- * libjanus: version 0.4.0.
+ * libjanus: version 0.4.0;
+ * lib/janus/samples/point1: trial configuration for virtual
+ synchrony net, initial implementation;
+
2007-08-27 Petr Ovtchenkov <pt...@is...>
* janus.h, janus.cc: hide methods, intended for internal
Property changes on: trunk/complement/explore/lib/janus/samples/point1
___________________________________________________________________
Name: svn:ignore
+ obj
Added: trunk/complement/explore/lib/janus/samples/point1/Makefile
===================================================================
--- trunk/complement/explore/lib/janus/samples/point1/Makefile (rev 0)
+++ trunk/complement/explore/lib/janus/samples/point1/Makefile 2007-09-25 14:28:38 UTC (rev 1745)
@@ -0,0 +1,26 @@
+# -*- Makefile -*- Time-stamp: <07/08/08 22:18:48 ptr>
+
+SRCROOT := ../../../..
+COMPILER_NAME := gcc
+# ALL_TAGS := install-release-shared install-dbg-shared
+# CoMT_DIR := ../../external/complement/explore
+
+include Makefile.inc
+include ${SRCROOT}/Makefiles/gmake/top.mak
+
+# DEFS += -DUNIT_TEST
+INCLUDES += -I${CoMT_INCLUDE_DIR}
+
+release-shared: PROJECT_LIBS = -lxmt -lsockios -lstem -ljanus
+dbg-shared: PROJECT_LIBS = -lxmtg -lsockiosg -lstemg -ljanusg
+ifndef WITHOUT_STLPORT
+stldbg-shared: PROJECT_LIBS = -lxmtstlg -lsockiosstlg -lstemstlg -ljanusstlg
+endif
+
+dbg-shared: DEFS += -D__FIT_VS_TRACE
+ifndef WITHOUT_STLPORT
+stldbg-shared: DEFS += -D__FIT_VS_TRACE
+endif
+
+LDLIBS = -L${CoMT_LIB_DIR} -Wl,-rpath=${CoMT_LIB_DIR}:${STLPORT_LIB_DIR} ${PROJECT_LIBS}
+
Added: trunk/complement/explore/lib/janus/samples/point1/Makefile.inc
===================================================================
--- trunk/complement/explore/lib/janus/samples/point1/Makefile.inc (rev 0)
+++ trunk/complement/explore/lib/janus/samples/point1/Makefile.inc 2007-09-25 14:28:38 UTC (rev 1745)
@@ -0,0 +1,5 @@
+# -*- Makefile -*-
+
+PRGNAME = point1
+
+SRC_CC = point1.cc
Added: trunk/complement/explore/lib/janus/samples/point1/point1.cc
===================================================================
--- trunk/complement/explore/lib/janus/samples/point1/point1.cc (rev 0)
+++ trunk/complement/explore/lib/janus/samples/point1/point1.cc 2007-09-25 14:28:38 UTC (rev 1745)
@@ -0,0 +1,87 @@
+// -*- C++ -*- Time-stamp: <07/08/26 12:54:05 ptr>
+
+#include <janus/vtime.h>
+#include <janus/janus.h>
+#include <janus/vshostmgr.h>
+
+#include <mt/xmt.h>
+
+#include <iostream>
+
+using namespace janus;
+using namespace std;
+using namespace xmt;
+
+#define VS_LINE 0x1300
+
+class YaSample :
+ public janus::VTHandler
+{
+ public:
+ YaSample();
+ YaSample( stem::addr_type id, const char *info = 0 );
+ YaSample( const char *info );
+ ~YaSample();
+
+ private:
+ void vs_line( const stem::Event& );
+
+ void VSNewMember( const stem::Event_base<VSsync_rq>& );
+ void VSOutMember( const stem::Event_base<VSsync_rq>& );
+
+ DECLARE_RESPONSE_TABLE( YaSample, janus::VTHandler );
+};
+
+YaSample::YaSample() :
+ janus::VTHandler()
+{
+}
+
+YaSample::YaSample( stem::addr_type id, const char *info ) :
+ janus::VTHandler( id, info )
+{
+}
+
+YaSample::YaSample( const char *info ) :
+ janus::VTHandler( info )
+{
+}
+
+YaSample::~YaSample()
+{
+}
+
+void YaSample::VSNewMember( const stem::Event_base<VSsync_rq>& ev )
+{
+ // VTNewMember_data( ev, "" );
+ VTHandler::VSNewMember( ev );
+}
+
+void YaSample::VSOutMember( const stem::Event_base<VSsync_rq>& )
+{
+}
+
+void YaSample::vs_line( const stem::Event& ev )
+{
+ cerr << "Line here" << endl;
+}
+
+DEFINE_RESPONSE_TABLE( YaSample )
+ EV_EDS( ST_NULL, VS_LINE, vs_line )
+END_RESPONSE_TABLE
+
+int main()
+{
+ VSHostMgr::add_srvport( 6700 );
+ VSHostMgr::add_wellknown( "island.corbina.net:6700" );
+
+ YaSample sample;
+
+ condition cnd;
+
+ cnd.set( false );
+
+ cnd.wait();
+
+ return 0;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-09-27 13:41:21
|
Revision: 1747
http://complement.svn.sourceforge.net/complement/?rev=1747&view=rev
Author: complement
Date: 2007-09-27 06:41:12 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
print trace info before stem's Send
Modified Paths:
--------------
trunk/complement/explore/lib/janus/ChangeLog
trunk/complement/explore/lib/janus/janus.cc
trunk/complement/explore/lib/janus/vshostmgr.cc
trunk/complement/explore/lib/janus/vtime.cc
Modified: trunk/complement/explore/lib/janus/ChangeLog
===================================================================
--- trunk/complement/explore/lib/janus/ChangeLog 2007-09-26 10:58:43 UTC (rev 1746)
+++ trunk/complement/explore/lib/janus/ChangeLog 2007-09-27 13:41:12 UTC (rev 1747)
@@ -1,3 +1,8 @@
+2007-09-27 Petr Ovtchenkov <pt...@is...>
+
+ * vshostmgr.cc, janus.cc, vtime.cc: print trace info before
+ stem's Send.
+
2007-09-25 Petr Ovtchenkov <pt...@is...>
* vshostmgr.h, vshostmgr.cc: try to connect to well-known hosts
Modified: trunk/complement/explore/lib/janus/janus.cc
===================================================================
--- trunk/complement/explore/lib/janus/janus.cc 2007-09-26 10:58:43 UTC (rev 1746)
+++ trunk/complement/explore/lib/janus/janus.cc 2007-09-27 13:41:12 UTC (rev 1747)
@@ -276,7 +276,6 @@
ev.dest( i->second.stem_addr() );
ev.src( addr );
ev.value().grp = grp;
- Forward( ev );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_lock_tr);
@@ -289,6 +288,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Forward( ev );
}
}
@@ -341,7 +341,6 @@
ev.dest( addr );
ev.src( i != vtmap.end() ? i->second.stem_addr() : self_id() );
ev.value().grp = grp;
- Forward( ev );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_lock_tr);
@@ -354,6 +353,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Forward( ev );
}
++range.first;
}
@@ -414,7 +414,6 @@
ev.dest( addr );
ev.src( i != vtmap.end() ? i->second.stem_addr() : self_id() );
ev.value().grp = *grp;
- Forward( ev );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_lock_tr);
@@ -427,6 +426,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Forward( ev );
}
++range.first;
}
@@ -510,7 +510,6 @@
{
if ( ev.value().grp == vshosts_group ) {
ev.dest( _hostmgr->self_id() );
- Forward( ev );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_lock_tr);
@@ -523,6 +522,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Forward( ev );
gaddr_type ga = manager()->reflect( ev.src() );
addr_type janus_addr = badaddr;
@@ -536,7 +536,6 @@
stem::Event_base<VSsync_rq> evr( VS_NEW_MEMBER_RV );
evr.dest( janus_addr );
evr.value().grp = vshosts_group;
- Send( evr );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_lock_tr);
@@ -549,8 +548,22 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
-
+ Send( evr );
}
+#ifdef __FIT_VS_TRACE
+ else {
+ try {
+ scoped_lock lk(_lock_tr);
+ if ( _trs != 0 && _trs->good() && (_trflags & tracegroup) ) {
+ *_trs << "Unexpected VS_NEW_MEMBER on Janus: G" << ev.value().grp << " "
+ << hex << showbase
+ << ev.src() << " -> " << ev.dest() << dec << endl;
+ }
+ }
+ catch ( ... ) {
+ }
+ }
+#endif // __FIT_VS_TRACE
}
void Janus::VSNewRemoteMemberDirect( const stem::Event_base<VSsync_rq>& ev )
@@ -576,7 +589,6 @@
evs.dest( i->second.stem_addr() );
evs.src( addr );
evs.value().grp = grp;
- Forward( evs );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_lock_tr);
@@ -589,11 +601,11 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Forward( evs );
stem::Event_base<VSsync_rq> evr( VS_NEW_MEMBER_RV );
evr.dest( janus_addr );
evr.src( i->second.stem_addr() );
evr.value().grp = grp;
- Forward( evr );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_lock_tr);
@@ -606,6 +618,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Forward( evr );
}
}
@@ -632,7 +645,6 @@
evs.dest( i->second.stem_addr() );
evs.src( addr );
evs.value().grp = grp;
- Forward( evs );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_lock_tr);
@@ -645,6 +657,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Forward( evs );
}
}
@@ -698,7 +711,6 @@
// send only to local addresses
if ( (addr & stem::extbit) == 0 ) {
ev.dest( addr );
- Forward( ev );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_lock_tr);
@@ -711,6 +723,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Forward( ev );
}
}
++range.first;
Modified: trunk/complement/explore/lib/janus/vshostmgr.cc
===================================================================
--- trunk/complement/explore/lib/janus/vshostmgr.cc 2007-09-26 10:58:43 UTC (rev 1746)
+++ trunk/complement/explore/lib/janus/vshostmgr.cc 2007-09-27 13:41:12 UTC (rev 1747)
@@ -188,7 +188,6 @@
stem::Event_base<VSsync_rq> ev( VS_NEW_MEMBER );
ev.dest( a );
ev.value().grp = vshosts_group; // special group
- Send( ev );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(vtdispatcher()->_lock_tr);
@@ -202,6 +201,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Send( ev );
return 0;
}
#ifdef __FIT_VS_TRACE
@@ -263,7 +263,6 @@
if ( ga != *i ) {
ev.dest( manager()->reflect( *i ) );
ev.value().grp = grp;
- Forward( ev );
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(vtdispatcher()->_lock_tr);
@@ -276,6 +275,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Forward( ev );
}
}
}
Modified: trunk/complement/explore/lib/janus/vtime.cc
===================================================================
--- trunk/complement/explore/lib/janus/vtime.cc 2007-09-26 10:58:43 UTC (rev 1746)
+++ trunk/complement/explore/lib/janus/vtime.cc 2007-09-27 13:41:12 UTC (rev 1747)
@@ -671,9 +671,6 @@
out_ev.value().grp = ev.value().grp;
get_gvtime( ev.value().grp, out_ev.value().gvt.gvt );
out_ev.value().mess = data;
-
- Send( out_ev );
-
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_vtdsp->_lock_tr);
@@ -686,6 +683,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Send( out_ev );
}
void VTHandler::get_gvtime( group_type g, gvtime_type& gvt )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-09-27 13:42:53
|
Revision: 1748
http://complement.svn.sourceforge.net/complement/?rev=1748&view=rev
Author: complement
Date: 2007-09-27 06:42:40 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
define __FIT_VS_TRACE macro for debug targets.
Modified Paths:
--------------
trunk/complement/explore/lib/janus/ChangeLog
trunk/complement/explore/lib/janus/Makefile
Modified: trunk/complement/explore/lib/janus/ChangeLog
===================================================================
--- trunk/complement/explore/lib/janus/ChangeLog 2007-09-27 13:41:12 UTC (rev 1747)
+++ trunk/complement/explore/lib/janus/ChangeLog 2007-09-27 13:42:40 UTC (rev 1748)
@@ -1,8 +1,10 @@
2007-09-27 Petr Ovtchenkov <pt...@is...>
* vshostmgr.cc, janus.cc, vtime.cc: print trace info before
- stem's Send.
+ stem's Send;
+ * Makefile: define __FIT_VS_TRACE macro for debug targets.
+
2007-09-25 Petr Ovtchenkov <pt...@is...>
* vshostmgr.h, vshostmgr.cc: try to connect to well-known hosts
Modified: trunk/complement/explore/lib/janus/Makefile
===================================================================
--- trunk/complement/explore/lib/janus/Makefile 2007-09-27 13:41:12 UTC (rev 1747)
+++ trunk/complement/explore/lib/janus/Makefile 2007-09-27 13:42:40 UTC (rev 1748)
@@ -20,6 +20,12 @@
endif
dbg-shared : LDLIBS = -lxmtg -lsockiosg -lstemg
+dbg-shared: DEFS += -D__FIT_VS_TRACE
+
+ifndef WITHOUT_STLPORT
+stldbg-shared: DEFS += -D__FIT_VS_TRACE
+endif
+
check: all-shared
$(MAKE) -C ut
(cd ut; ${OUTPUT_DIR}/ut_vtime) || exit 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-10-01 15:57:21
|
Revision: 1755
http://complement.svn.sourceforge.net/complement/?rev=1755&view=rev
Author: complement
Date: 2007-10-01 08:55:37 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
trace enhansements
Modified Paths:
--------------
trunk/complement/explore/lib/janus/ChangeLog
trunk/complement/explore/lib/janus/janus.cc
trunk/complement/explore/lib/janus/vshostmgr.cc
trunk/complement/explore/lib/janus/vtime.cc
Modified: trunk/complement/explore/lib/janus/ChangeLog
===================================================================
--- trunk/complement/explore/lib/janus/ChangeLog 2007-10-01 13:12:40 UTC (rev 1754)
+++ trunk/complement/explore/lib/janus/ChangeLog 2007-10-01 15:55:37 UTC (rev 1755)
@@ -1,3 +1,9 @@
+2007-10-01 Petr Ovtchenkov <pt...@is...>
+
+ * janus.cc, vshostmgr.cc: more trace prints;
+
+ * vtime.cc: trace before Send call.
+
2007-09-27 Petr Ovtchenkov <pt...@is...>
* vshostmgr.cc, janus.cc, vtime.cc: print trace info before
Modified: trunk/complement/explore/lib/janus/janus.cc
===================================================================
--- trunk/complement/explore/lib/janus/janus.cc 2007-10-01 13:12:40 UTC (rev 1754)
+++ trunk/complement/explore/lib/janus/janus.cc 2007-10-01 15:55:37 UTC (rev 1755)
@@ -269,6 +269,26 @@
pair<gid_map_type::const_iterator,gid_map_type::const_iterator> range =
grmap.equal_range( grp );
+#ifdef __FIT_VS_TRACE
+ try {
+ scoped_lock lk(_lock_tr);
+ if ( _trs != 0 && _trs->good() && (_trflags & tracegroup) ) {
+ int f = _trs->flags();
+ *_trs << " VS subscribe G" << grp << " "
+ << hex << showbase
+ << addr << " " << oid << dec << ", group size before "
+ << distance( range.first, range.second ) << endl;
+#ifdef STLPORT
+ _trs->flags( f );
+#else
+ _trs->flags( static_cast<std::_Ios_Fmtflags>(f) );
+#endif
+ }
+ }
+ catch ( ... ) {
+ }
+#endif // __FIT_VS_TRACE
+
for ( ; range.first != range.second; ++range.first ) {
vt_map_type::iterator i = vtmap.find( range.first->second );
if ( i != vtmap.end() ) {
@@ -670,6 +690,23 @@
const addr_type addr = ev.src();
const gaddr_type oid = manager()->reflect( ev.src() ); // ???? oid == gaddr
+#ifdef __FIT_VS_TRACE
+ try {
+ scoped_lock lk(_lock_tr);
+ if ( _trs != 0 && _trs->good() && (_trflags & tracegroup) ) {
+ int f = _trs->flags();
+ *_trs << " VS see node " << hex << showbase << oid << endl;
+#ifdef STLPORT
+ _trs->flags( f );
+#else
+ _trs->flags( static_cast<std::_Ios_Fmtflags>(f) );
+#endif
+ }
+ }
+ catch ( ... ) {
+ }
+#endif // __FIT_VS_TRACE
+
vtmap[oid].add( addr, vshosts_group );
grmap.insert( make_pair(static_cast<group_type>(vshosts_group),oid) );
// cerr << "**** " << vshosts_group << " " << xmt::getpid() << endl;
Modified: trunk/complement/explore/lib/janus/vshostmgr.cc
===================================================================
--- trunk/complement/explore/lib/janus/vshostmgr.cc 2007-10-01 13:12:40 UTC (rev 1754)
+++ trunk/complement/explore/lib/janus/vshostmgr.cc 2007-10-01 15:55:37 UTC (rev 1755)
@@ -159,6 +159,16 @@
while ( sz-- > 0 ) {
ga.net_unpack( s );
// vshost.push_back( ga );
+#ifdef __FIT_VS_TRACE
+ try {
+ scoped_lock lk(vtdispatcher()->_lock_tr);
+ if ( vtdispatcher()->_trs != 0 && vtdispatcher()->_trs->good() && (vtdispatcher()->_trflags & Janus::tracenet) ) {
+ *vtdispatcher()->_trs << "VS see node " << ga << endl;
+ }
+ }
+ catch ( ... ) {
+ }
+#endif // __FIT_VS_TRACE
vshost.insert( ga );
}
Modified: trunk/complement/explore/lib/janus/vtime.cc
===================================================================
--- trunk/complement/explore/lib/janus/vtime.cc 2007-10-01 13:12:40 UTC (rev 1754)
+++ trunk/complement/explore/lib/janus/vtime.cc 2007-10-01 15:55:37 UTC (rev 1755)
@@ -647,9 +647,6 @@
out_ev.dest( ev.src() );
out_ev.value().grp = ev.value().grp;
get_gvtime( ev.value().grp, out_ev.value().gvt.gvt );
-
- Send( out_ev );
-
#ifdef __FIT_VS_TRACE
try {
scoped_lock lk(_vtdsp->_lock_tr);
@@ -662,6 +659,7 @@
catch ( ... ) {
}
#endif // __FIT_VS_TRACE
+ Send( out_ev );
}
void VTHandler::VSNewMember_data( const stem::Event_base<VSsync_rq>& ev, const string& data )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2007-10-01 16:33:31
|
Revision: 1756
http://complement.svn.sourceforge.net/complement/?rev=1756&view=rev
Author: complement
Date: 2007-10-01 09:33:28 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
more traces
Modified Paths:
--------------
trunk/complement/explore/lib/janus/janus.cc
trunk/complement/explore/lib/janus/vshostmgr.cc
Modified: trunk/complement/explore/lib/janus/janus.cc
===================================================================
--- trunk/complement/explore/lib/janus/janus.cc 2007-10-01 15:55:37 UTC (rev 1755)
+++ trunk/complement/explore/lib/janus/janus.cc 2007-10-01 16:33:28 UTC (rev 1756)
@@ -318,6 +318,16 @@
// cerr << "**** " << grp << " " << xmt::getpid() << endl;
if ( /* (grp != vshosts_group) && */ (_hostmgr != 0) ) {
+#ifdef __FIT_VS_TRACE
+ try {
+ scoped_lock lk(_lock_tr);
+ if ( _trs != 0 && _trs->good() && (_trflags & tracegroup) ) {
+ *_trs << " ????? " << __FILE__ << ":" << __LINE__ << endl;
+ }
+ }
+ catch ( ... ) {
+ }
+#endif // __FIT_VS_TRACE
_hostmgr->Subscribe( addr, grp );
}
}
Modified: trunk/complement/explore/lib/janus/vshostmgr.cc
===================================================================
--- trunk/complement/explore/lib/janus/vshostmgr.cc 2007-10-01 15:55:37 UTC (rev 1755)
+++ trunk/complement/explore/lib/janus/vshostmgr.cc 2007-10-01 16:33:28 UTC (rev 1756)
@@ -120,6 +120,16 @@
ga.addr = stem::janus_addr;
}
+#ifdef __FIT_VS_TRACE
+ try {
+ scoped_lock lk(vtdispatcher()->_lock_tr);
+ if ( vtdispatcher()->_trs != 0 && vtdispatcher()->_trs->good() && (vtdispatcher()->_trflags & Janus::tracenet) ) {
+ *vtdispatcher()->_trs << "VSHostMgr sync (add) " << ga << endl;
+ }
+ }
+ catch ( ... ) {
+ }
+#endif // __FIT_VS_TRACE
vshost.insert( ga ); // address of remote Janus
stem::__pack_base::__net_pack( s, static_cast<uint32_t>(vshost.size()) );
@@ -163,7 +173,7 @@
try {
scoped_lock lk(vtdispatcher()->_lock_tr);
if ( vtdispatcher()->_trs != 0 && vtdispatcher()->_trs->good() && (vtdispatcher()->_trflags & Janus::tracenet) ) {
- *vtdispatcher()->_trs << "VS see node " << ga << endl;
+ *vtdispatcher()->_trs << "VSHostMgr sync " << ga << endl;
}
}
catch ( ... ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X