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

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

Revision: 1698
          http://complement.svn.sourceforge.net/complement/?rev=1698&view=rev
Author:   complement
Date:     2007-08-17 22:13:06 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
add fixed address for janus [virtual synchrony dispatcher, janus subproject]

Modified Paths:
--------------
    trunk/complement/explore/include/stem/Event.h
    trunk/complement/explore/lib/janus/vtime.cc
    trunk/complement/explore/lib/stem/ChangeLog
    trunk/complement/explore/lib/stem/EvManager.cc

Modified: trunk/complement/explore/include/stem/Event.h
===================================================================
--- trunk/complement/explore/include/stem/Event.h	2007-08-17 18:06:59 UTC (rev 1697)
+++ trunk/complement/explore/include/stem/Event.h	2007-08-18 05:13:06 UTC (rev 1698)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/08/03 08:19:34 ptr>
+// -*- C++ -*- Time-stamp: <07/08/17 22:15:41 ptr>
 
 /*
  *
@@ -40,6 +40,7 @@
 extern const addr_type extbit;
 extern const addr_type default_addr;
 extern const addr_type ns_addr;
+extern const addr_type janus_addr;
 extern const code_type badcode;
 
 struct gaddr_type :

Modified: trunk/complement/explore/lib/janus/vtime.cc
===================================================================
--- trunk/complement/explore/lib/janus/vtime.cc	2007-08-17 18:06:59 UTC (rev 1697)
+++ trunk/complement/explore/lib/janus/vtime.cc	2007-08-18 05:13:06 UTC (rev 1698)
@@ -1,4 +1,4 @@
-// -*- C++ -*- Time-stamp: <07/08/17 10:39:02 ptr>
+// -*- C++ -*- Time-stamp: <07/08/17 22:28:55 ptr>
 
 #include <janus/vtime.h>
 
@@ -1013,7 +1013,7 @@
       _rcount = &_count;
       pthread_atfork( __at_fork_prepare, __at_fork_parent, __at_fork_child );
 #endif
-      VTHandler::_vtdsp = new Janus( 2, "vtd" );
+      VTHandler::_vtdsp = new Janus( janus_addr, "janus" );
     }
   } else {
     --_count;
@@ -1040,24 +1040,18 @@
    EventHandler()
 {
   new( Init_buf ) Init();
-
-  // _vtdsp->Subscribe( self_id(), oid_type( self_id() ), /* grp */ 0 );
 }
 
 VTHandler::VTHandler( const char *info ) :
    EventHandler( info )
 {
   new( Init_buf ) Init();
-
-  // _vtdsp->Subscribe( self_id(), oid_type( self_id() ), /* grp */ 0 );
 }
 
 VTHandler::VTHandler( stem::addr_type id, const char *info ) :
    EventHandler( id, info )
 {
   new( Init_buf ) Init();
-
-  // _vtdsp->Subscribe( id, oid_type( id ), /* grp */ 0 );
 }
 
 VTHandler::~VTHandler()

Modified: trunk/complement/explore/lib/stem/ChangeLog
===================================================================
--- trunk/complement/explore/lib/stem/ChangeLog	2007-08-17 18:06:59 UTC (rev 1697)
+++ trunk/complement/explore/lib/stem/ChangeLog	2007-08-18 05:13:06 UTC (rev 1698)
@@ -1,3 +1,8 @@
+2007-08-17  Petr Ovtchenkov  <pt...@is...>
+
+	* Event.h, EvManager.cc: add fixed address for janus
+	[virtual synchrony dispatcher, janus subproject].
+
 2007-08-03  Petr Ovtchenkov  <pt...@is...>
 
 	* Makefile: let's try don't include boost's -I if macro

Modified: trunk/complement/explore/lib/stem/EvManager.cc
===================================================================
--- trunk/complement/explore/lib/stem/EvManager.cc	2007-08-17 18:06:59 UTC (rev 1697)
+++ trunk/complement/explore/lib/stem/EvManager.cc	2007-08-18 05:13:06 UTC (rev 1698)
@@ -1,8 +1,8 @@
-// -*- C++ -*- Time-stamp: <07/08/03 09:20:31 ptr>
+// -*- C++ -*- Time-stamp: <07/08/17 22:22:13 ptr>
 
 /*
  *
- * Copyright (c) 1995-1999, 2002, 2003, 2005, 2006
+ * Copyright (c) 1995-1999, 2002, 2003, 2005-2007
  * Petr Ovtchenkov
  *
  * Copyright (c) 1999-2001
@@ -29,11 +29,12 @@
 using namespace std;
 using namespace xmt;
 
-const addr_type badaddr    = 0xffffffff;
-const code_type badcode    = static_cast<code_type>(-1);
-const addr_type extbit     = 0x80000000;
+const addr_type badaddr      = 0xffffffff;
+const code_type badcode      = 0xffffffff;
+const addr_type extbit       = 0x80000000;
 const addr_type default_addr = 0x00000000;
-const addr_type ns_addr    = 0x00000001;
+const addr_type ns_addr      = 0x00000001;
+const addr_type janus_addr   = 0x00000002;
 
 const addr_type beglocaddr = 0x00000100;
 const addr_type endlocaddr = 0x3fffffff;


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