[Dfsm-devel] dFSM/include/libdfsm sm_lists.h,1.5,1.6 sm_route_table.h,1.9,1.10 sm_seq.h,1.6,1.7

[Andreu M. <am...@us...>]

Update of /cvsroot/dfsm/dFSM/include/libdfsm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14192/include/libdfsm

Modified Files:
	sm_lists.h sm_route_table.h sm_seq.h 
Log Message:
Events are now total ordered. Solved bug in using the same semaphore for sm_route_table and sm_seq

Index: sm_seq.h
===================================================================
RCS file: /cvsroot/dfsm/dFSM/include/libdfsm/sm_seq.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sm_seq.h	3 Aug 2003 21:12:07 -0000	1.6
--- sm_seq.h	30 Mar 2004 15:12:30 -0000	1.7
***************
*** 30,33 ****
--- 30,36 ----
   * $Revision$
   * $Log$
+  * Revision 1.7  2004/03/30 15:12:30  amoreno
+  * Events are now total ordered. Solved bug in using the same semaphore for sm_route_table and sm_seq
+  *
   * Revision 1.6  2003/08/03 21:12:07  jvalduvieco
   * Major cleaning:
***************
*** 60,63 ****
--- 63,67 ----
  
  #define OUR_ID_MEMORY_KEY_SM_SEQ 5549
+ #define SEQ_SEMAPHORE_KEY ((key_t)99888)
  
  //#define DEBUG_SM_SEQ
***************
*** 84,92 ****
  
  	/**
! 	* Get sequence number
! 	*
  	* @return Sequence number
  	*/
! 	u_int32_t get_n_seq();
  
  protected:
--- 88,103 ----
  
  	/**
! 	* Get sequence number and lock
! 	* It is needed to achive total order of messages
  	* @return Sequence number
  	*/
! 	u_int32_t get_n_seq_lock();
! 
! 	/**
! 	* Unlock get sequence number
! 	*
! 	* @return true if OK
! 	*/
! 	bool get_n_seq_unlock();
  
  protected:

Index: sm_route_table.h
===================================================================
RCS file: /cvsroot/dfsm/dFSM/include/libdfsm/sm_route_table.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sm_route_table.h	19 Mar 2004 21:05:09 -0000	1.9
--- sm_route_table.h	30 Mar 2004 15:12:30 -0000	1.10
***************
*** 30,33 ****
--- 30,36 ----
   * $Revision$
   * $Log$
+  * Revision 1.10  2004/03/30 15:12:30  amoreno
+  * Events are now total ordered. Solved bug in using the same semaphore for sm_route_table and sm_seq
+  *
   * Revision 1.9  2004/03/19 21:05:09  jvalduvieco
   * Prerelease cleanup.
***************
*** 67,70 ****
--- 70,74 ----
  #define OUR_ID_MEMORY_KEY 5548
  #define SHARED_SEGMENT 0x1000
+ #define SM_SEMAPHORE_KEY ((key_t)99887)
  
  // Max. number of state machines (0...MAX_MACHINE)

Index: sm_lists.h
===================================================================
RCS file: /cvsroot/dfsm/dFSM/include/libdfsm/sm_lists.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sm_lists.h	28 Dec 2003 08:11:21 -0000	1.5
--- sm_lists.h	30 Mar 2004 15:12:30 -0000	1.6
***************
*** 30,33 ****
--- 30,36 ----
   * $Revision$
   * $Log$
+  * Revision 1.6  2004/03/30 15:12:30  amoreno
+  * Events are now total ordered. Solved bug in using the same semaphore for sm_route_table and sm_seq
+  *
   * Revision 1.5  2003/12/28 08:11:21  amoreno
   * dfsm_monitor: bug cleaning in initialization
***************
*** 67,70 ****
--- 70,75 ----
  #include "libdfsm/sm_route_table.h" /**< for MAX_MACHINE*/
  
+ 
+ 
  using namespace std;