[Dfsm-devel] dFSM/include/libdfsm tfsm.h,1.23,1.24 tinput.h,1.16,1.17

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

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

Modified Files:
	tfsm.h tinput.h 
Log Message:
Add support for manual and automatic state machine identification

Index: tinput.h
===================================================================
RCS file: /cvsroot/dfsm/dFSM/include/libdfsm/tinput.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tinput.h	31 Mar 2004 16:42:19 -0000	1.16
--- tinput.h	3 Apr 2004 06:32:01 -0000	1.17
***************
*** 32,35 ****
--- 32,38 ----
   * $Revision$
   * $Log$
+  * Revision 1.17  2004/04/03 06:32:01  amoreno
+  * Add support for manual and automatic state machine identification
+  *
   * Revision 1.16  2004/03/31 16:42:19  amoreno
   * Tinput interface supports send and send_to (useful for utilities) and change monitor as service
***************
*** 139,142 ****
--- 142,160 ----
  
  	/**
+ 	* Initilize with automatic Machine identification
+ 	*
+ 	* @return True if OK
+ 	*/
+ 	bool init();
+ 
+ 	/**
+ 	* Initilize
+ 	*
+ 	* @param machine_id Machine identification.
+ 	* @return True if OK
+ 	*/
+ 	bool init(u_int16_t machine_id);
+ 
+ 	/**
  	* Send a message to other machines
  	* A list of machines is subscribed to a message id (id_msg). When this function is invoked a message
***************
*** 202,207 ****
  
  private:
! 	const char *socket_name; /**< Socket name */
! 	const char *reserve_socket_server();	/**< Finds the first avalable id in SOCKET_DIR */
  };
  
--- 220,227 ----
  
  private:
! 	char *socket_name; /**< Socket name */
! 	void check_socket_dir();
! 	char *reserve_socket_server();	/**< Finds the first avalable id in SOCKET_DIR */
! 	bool initialized; /**< initilized flag */
  };
  

Index: tfsm.h
===================================================================
RCS file: /cvsroot/dfsm/dFSM/include/libdfsm/tfsm.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** tfsm.h	31 Mar 2004 16:42:19 -0000	1.23
--- tfsm.h	3 Apr 2004 06:32:01 -0000	1.24
***************
*** 30,33 ****
--- 30,36 ----
   * $Revision$
   * $Log$
+  * Revision 1.24  2004/04/03 06:32:01  amoreno
+  * Add support for manual and automatic state machine identification
+  *
   * Revision 1.23  2004/03/31 16:42:19  amoreno
   * Tinput interface supports send and send_to (useful for utilities) and change monitor as service
***************
*** 148,151 ****
--- 151,156 ----
  									verified when inserting a new state. */
  									//	Maybe we should work with state pointers...
+ // For Machine identification atomatic
+ #define MACHINE_ID_AUTO 0xFFFF
  
  class tFSM;
***************
*** 176,184 ****
  	/**
  	* Class constructor
  	* @param name Gives a more human friendly identifier to the machine.
  	* @param log_level log level selected.
  	* @param file finename to output log traces.
  	*/
! 	tFSM(const char *name, u_int8_t log_level, const char* file=NULL);
  
  	/**
--- 181,190 ----
  	/**
  	* Class constructor
+ 	* @param machine_id Machine identification.
  	* @param name Gives a more human friendly identifier to the machine.
  	* @param log_level log level selected.
  	* @param file finename to output log traces.
  	*/
! 	tFSM(u_int16_t machine_id, const char *name, u_int8_t log_level, const char* file=NULL);
  
  	/**