[complement-svn] SF.net SVN: complement: [1669] trunk/complement/explore
Status: Pre-Alpha
Brought to you by:
complement
Menu
▾
▴
[complement-svn] SF.net SVN: complement: [1669] trunk/complement/explore
|
From: <com...@us...> - 2007-08-03 19:46:49
|
Revision: 1669
http://complement.svn.sourceforge.net/complement/?rev=1669&view=rev
Author: complement
Date: 2007-08-03 12:46:45 -0700 (Fri, 03 Aug 2007)
Log Message:
-----------
tests moved to ut
Modified Paths:
--------------
trunk/complement/explore/lib/sockios/ChangeLog
trunk/complement/explore/lib/sockios/Makefile
trunk/complement/explore/lib/sockios/ut/Makefile
trunk/complement/explore/test/virtual_time/test/vt_handler.cc
trunk/complement/explore/test/virtual_time/vtime.cc
trunk/complement/explore/test/virtual_time/vtime.h
Added Paths:
-----------
trunk/complement/explore/lib/sockios/ut/
Removed Paths:
-------------
trunk/complement/explore/test/sockios/
Modified: trunk/complement/explore/lib/sockios/ChangeLog
===================================================================
--- trunk/complement/explore/lib/sockios/ChangeLog 2007-08-03 18:26:43 UTC (rev 1668)
+++ trunk/complement/explore/lib/sockios/ChangeLog 2007-08-03 19:46:45 UTC (rev 1669)
@@ -1,8 +1,10 @@
2007-08-03 Petr Ovtchenkov <pt...@is...>
* include/sockios/sockstream: workaround for file openmode
- for libstdc++ shipped with gcc 3.3.6.
+ for libstdc++ shipped with gcc 3.3.6;
+ * ../../test/sockios: moved to ut.
+
2007-07-18 Petr Ovtchenkov <pt...@is...>
* test/sockios: boost unit test framework replaced by exam.
Modified: trunk/complement/explore/lib/sockios/Makefile
===================================================================
--- trunk/complement/explore/lib/sockios/Makefile 2007-08-03 18:26:43 UTC (rev 1668)
+++ trunk/complement/explore/lib/sockios/Makefile 2007-08-03 19:46:45 UTC (rev 1669)
@@ -1,4 +1,4 @@
-# -*- Makefile -*- Time-stamp: <07/01/23 14:59:53 ptr>
+# -*- Makefile -*- Time-stamp: <07/08/03 23:06:18 ptr>
SRCROOT := ../..
@@ -8,24 +8,29 @@
INCLUDES += -I$(SRCROOT)/include
check: all-shared
- $(MAKE) -C ../../test/sockios
- (cd ../../test/sockios; ${OUTPUT_DIR}/sockios_ut) || exit 1
- (cd ../../test/sockios; ${OUTPUT_DIR_DBG}/sockios_ut) || exit 1
- (cd ../../test/sockios; ${OUTPUT_DIR_STLDBG}/sockios_ut) || exit 1
+ $(MAKE) -C ut
+ (cd ut; ${OUTPUT_DIR}/sockios_ut) || exit 1
+ (cd ut; ${OUTPUT_DIR_DBG}/sockios_ut) || exit 1
+ifndef WITHOUT_STLPORT
+ (cd ut; ${OUTPUT_DIR_STLDBG}/sockios_ut) || exit 1
+endif
check-release-shared: release-shared
- $(MAKE) -C ../../test/sockios release-shared
- (cd ../../test/sockios; ${OUTPUT_DIR}/sockios_ut) || exit 1
+ $(MAKE) -C ut release-shared
+ (cd ut; ${OUTPUT_DIR}/sockios_ut) || exit 1
check-dbg-shared: dbg-shared
- $(MAKE) -C ../../test/sockios dbg-shared
- (cd ../../test/sockios; ${OUTPUT_DIR_DBG}/sockios_ut) || exit 1
+ $(MAKE) -C ut dbg-shared
+ (cd ut; ${OUTPUT_DIR_DBG}/sockios_ut) || exit 1
ifndef WITHOUT_STLPORT
check-stldbg-shared: stldbg-shared
- $(MAKE) -C ../../test/sockios stldbg-shared
- (cd ../../test/sockios; ${OUTPUT_DIR_STLDBG}/sockios_ut) || exit 1
+ $(MAKE) -C ut stldbg-shared
+ (cd ut; ${OUTPUT_DIR_STLDBG}/sockios_ut) || exit 1
endif
depend::
- $(MAKE) -C ../../test/sockios depend
+ $(MAKE) -C ut depend
+
+clean::
+ $(MAKE) -C ut clean
Copied: trunk/complement/explore/lib/sockios/ut (from rev 1668, trunk/complement/explore/test/sockios)
Modified: trunk/complement/explore/lib/sockios/ut/Makefile
===================================================================
--- trunk/complement/explore/test/sockios/Makefile 2007-08-03 18:26:43 UTC (rev 1668)
+++ trunk/complement/explore/lib/sockios/ut/Makefile 2007-08-03 19:46:45 UTC (rev 1669)
@@ -1,6 +1,6 @@
-# -*- Makefile -*- Time-stamp: <07/07/18 08:44:04 ptr>
+# -*- Makefile -*- Time-stamp: <07/08/03 23:06:43 ptr>
-SRCROOT := ../..
+SRCROOT := ../../..
include Makefile.inc
include ${SRCROOT}/Makefiles/gmake/top.mak
Modified: trunk/complement/explore/test/virtual_time/test/vt_handler.cc
===================================================================
--- trunk/complement/explore/test/virtual_time/test/vt_handler.cc 2007-08-03 18:26:43 UTC (rev 1668)
+++ trunk/complement/explore/test/virtual_time/test/vt_handler.cc 2007-08-03 19:46:45 UTC (rev 1669)
@@ -21,10 +21,12 @@
void handler( const stem::Event& );
void VTNewMember( const stem::Event& );
+ void VTOutMember( const stem::Event& );
void wait();
std::string msg;
int count;
+ int ocount;
private:
xmt::condition cnd;
@@ -36,21 +38,24 @@
VTDummy::VTDummy() :
VTHandler(),
- count(0)
+ count(0),
+ ocount(0)
{
cnd.set( false );
}
VTDummy::VTDummy( stem::addr_type id ) :
VTHandler( id ),
- count(0)
+ count(0),
+ ocount(0)
{
cnd.set( false );
}
VTDummy::VTDummy( stem::addr_type id, const char *info ) :
VTHandler( id, info ),
- count(0)
+ count(0),
+ ocount(0)
{
cnd.set( false );
}
@@ -73,6 +78,12 @@
++count;
}
+void VTDummy::VTOutMember( const stem::Event& ev )
+{
+ // cerr << "Hello" << endl;
+ ++ocount;
+}
+
void VTDummy::wait()
{
cnd.try_wait();
@@ -172,6 +183,9 @@
EXAM_CHECK( dummy2.msg == "yet more" );
EXAM_CHECK( dummy1.msg == "" );
+ EXAM_CHECK( dummy1.ocount == 1 );
+ EXAM_CHECK( dummy2.ocount == 1 );
+
return EXAM_RESULT;
}
Modified: trunk/complement/explore/test/virtual_time/vtime.cc
===================================================================
--- trunk/complement/explore/test/virtual_time/vtime.cc 2007-08-03 18:26:43 UTC (rev 1668)
+++ trunk/complement/explore/test/virtual_time/vtime.cc 2007-08-03 19:46:45 UTC (rev 1669)
@@ -608,15 +608,22 @@
pair<gid_map_type::iterator,gid_map_type::iterator> range =
grmap.equal_range( grp );
+ vt_map_type::iterator i = vtmap.find( oid );
while ( range.first != range.second ) {
if ( range.first->second == oid ) {
grmap.erase( range.first++ );
} else {
+ vt_map_type::iterator j = vtmap.find( range.first->second );
+ if ( j != vtmap.end() ) {
+ stem::Event ev( VTS_OUT_MEMBER );
+ ev.dest( j->second.stem_addr() );
+ ev.src( i != vtmap.end() ? i->second.stem_addr() : self_id() );
+ Forward( ev );
+ }
++range.first;
}
}
- vt_map_type::iterator i = vtmap.find( oid );
if ( i != vtmap.end() ) {
if ( i->second.rm_group( grp ) ) { // no groups more
vtmap.erase( i );
@@ -720,8 +727,13 @@
{
}
+void VTHandler::VTOutMember( const stem::Event& )
+{
+}
+
DEFINE_RESPONSE_TABLE( VTHandler )
EV_EDS( ST_NULL, VTS_NEW_MEMBER, VTNewMember )
+ EV_EDS( ST_NULL, VTS_OUT_MEMBER, VTOutMember )
END_RESPONSE_TABLE
} // namespace vt
Modified: trunk/complement/explore/test/virtual_time/vtime.h
===================================================================
--- trunk/complement/explore/test/virtual_time/vtime.h 2007-08-03 18:26:43 UTC (rev 1668)
+++ trunk/complement/explore/test/virtual_time/vtime.h 2007-08-03 19:46:45 UTC (rev 1669)
@@ -292,6 +292,7 @@
void VTSend( const stem::Event& e );
virtual void VTNewMember( const stem::Event& e );
+ virtual void VTOutMember( const stem::Event& e );
template <class D>
void VTSend( const stem::Event_base<D>& e )
@@ -306,6 +307,7 @@
#define MESS 0x300
#define VTS_NEW_MEMBER 0x301
+#define VTS_OUT_MEMBER 0x302
} // namespace vt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
