Update evt to B spec

remove event related code and move to ipc_evt.h and saEvt.h

(Logical change 1.130)


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@467 fd59a12c-fef9-0310-b244-a6a79926bd2f

include/ais_msg.h

@@ -150,39 +150,6 @@ enum res_lib_ckpt_sectioniterator_types {
 	MESSAGE_RES_CKPT_SECTIONITERATOR_SECTIONITERATORNEXT
 };
 
-enum req_evt_types {
-	MESSAGE_REQ_EVT_OPEN_CHANNEL = 1,
-	MESSAGE_REQ_EVT_CLOSE_CHANNEL,
-	MESSAGE_REQ_EVT_SUBSCRIBE,
-	MESSAGE_REQ_EVT_UNSUBSCRIBE,
-	MESSAGE_REQ_EVT_PUBLISH,
-	MESSAGE_REQ_EVT_CLEAR_RETENTIONTIME,
-	MESSAGE_REQ_EVT_EVENT_DATA
-};
-
-enum res_evt_types {
-	MESSAGE_RES_EVT_OPEN_CHANNEL = 1,
-	MESSAGE_RES_EVT_CLOSE_CHANNEL,
-	MESSAGE_RES_EVT_SUBSCRIBE,
-	MESSAGE_RES_EVT_UNSUBSCRIBE,
-	MESSAGE_RES_EVT_PUBLISH,
-	MESSAGE_RES_EVT_CLEAR_RETENTIONTIME,
-	MESSAGE_RES_EVT_CHAN_OPEN_CALLBACK,
-	MESSAGE_RES_EVT_EVENT_DATA,
-	MESSAGE_RES_EVT_AVAILABLE
-};
-
-struct req_header {
-	int size;
-	int id;
-} __attribute__((packed));
-
-struct res_header {
-	int size;
-	int id;
-	SaErrorT error;
-};
-
 struct message_source {
 	struct conn_info *conn_info;
 	struct in_addr in_addr;
@@ -717,273 +684,4 @@ struct res_lib_ckpt_checkpointsynchronizeasync {
 	struct res_header header;
 };
 
-/* 
- * MESSAGE_REQ_EVT_OPEN_CHANNEL
- *
- * ico_head				Request head
- * ico_open_flag:		Channel open flags
- * ico_channel_name:	Name of channel to open
- * ico_c_handle:		Local lib channel handle (used in returned event data)
- * ico_timeout:			Used only by open
- * ico_invocation:		Used only by async open
- *
- */
-struct req_evt_channel_open {
-
-	struct req_header	ico_head;
-	SaUint8T				ico_open_flag;
-	SaNameT					ico_channel_name;
-	SaEvtChannelHandleT		ico_c_handle;	/* client chan handle */
-	SaTimeT					ico_timeout;    /* open only */
-	SaInvocationT			ico_invocation; /* open async only */
-};
-
-/*
- * MESSAGE_RES_EVT_OPEN_CHANNEL
- * 
- *
- * ico_head:			Results head
- * ico_error:			Request results
- * ico_channel_handle:	Server side channel handle (used in channel ops)
- *
- */
-struct res_evt_channel_open {
-
-	struct res_header	ico_head;
-	uint32_t				ico_channel_handle;/* svr chan handle */
-
-};
-
-/*
- * MESSAGE_RES_EVT_CHAN_OPEN_CALLBACK
- *
- * TODO: Define this
- */
-struct res_evt_open_chan_async {
-	struct res_header	ico_head;
-};
-
-
-/*
- * MESSAGE_REQ_EVT_CLOSE_CHANNEL
- *
- * icc_head:			Request head
- * icc_channel_handle:	Server handle of channel to close
- *
- */
-struct req_evt_channel_close {
-
-	struct req_header	icc_head;
-	uint32_t				icc_channel_handle;
-};
-
-/*
- * MESSAGE_RES_EVT_CLOSE_CHANNEL
- *
- * icc_head:		Results head
- * icc_error:		Request result
- *
- */
-struct res_evt_channel_close {
-	struct res_header	icc_head;
-};
-
-/* 
- * MESSAGE_REQ_EVT_SUBSCRIBE
- *
- * ics_head:			Request head
- * ics_channel_handle:	Server handle of channel
- * ics_sub_id:			Subscription ID
- * ics_filter_size:		Size of supplied filter data
- * ics_filter_count:	Number of filters supplied
- * ics_filter_data:		Filter data
- *
- */
-struct req_evt_event_subscribe {
-
-	struct req_header	ics_head;
-	uint32_t				ics_channel_handle;
-	SaEvtSubscriptionIdT	ics_sub_id;
-	uint32_t				ics_filter_size;
-	uint32_t				ics_filter_count;
-	uint8_t					ics_filter_data[0];
-
-};
-
-/*
- * MESSAGE_RES_EVT_SUBSCRIBE
- *
- * ics_head:		Result head
- * ics_error:		Request results
- *
- */
-struct res_evt_event_subscribe {
-	struct res_header	ics_head;
-};
-
-/*
- * MESSAGE_REQ_EVT_UNSUBSCRIBE
- *
- * icu_head:			Request head
- * icu_channel_handle:	Server handle of channel
- * icu_sub_id:			Subscription ID
- *
- */
-struct req_evt_event_unsubscribe {
-
-	struct req_header	icu_head;
-	uint32_t				icu_channel_handle;
-	SaEvtSubscriptionIdT	icu_sub_id;
-};
-
-
-/*
- * MESSAGE_RES_EVT_UNSUBSCRIBE
- *
- * icu_head:		Results head
- * icu_error:		request result
- *
- */
-struct res_evt_event_unsubscribe {
-	struct res_header	icu_head;
-
-};
-
-/*
- * MESSAGE_REQ_EVT_EVENT_DATA
- * MESSAGE_RES_EVT_AVAILABLE
- *
- * evd_head:		Request Head
- */
-struct res_evt_event_data {
-		struct res_header	evd_head;
-};
-
-/*
- * MESSAGE_REQ_EVT_PUBLISH			(1)
- * MESSAGE_RES_EVT_EVENT_DATA		(2)
- * MESSAGE_REQ_EXEC_EVT_EVENTDATA	(3)
- * MESSAGE_REQ_EXEC_EVT_RECOVERY_EVENTDATA	(4)
- *
- * led_head:				Request/Results head
- * led_in_addr:				address of node (4 only)
- * led_receive_time:		Time that the message was received (4 only)
- * led_svr_channel_handle:	Server channel handle (1 only)
- * led_lib_channel_handle:	Lib channel handle (2 only)
- * led_chan_name:			Channel name (3 and 4 only)
- * led_event_id:			Event ID (2, 3 and 4 only)
- * led_sub_id:				Subscription ID (2 only)
- * led_publisher_node_id:	Node ID of event publisher
- * led_publisher_name:		Node name of event publisher
- * led_retention_time:		Event retention time
- * led_publish_time:		Publication time of the event
- * led_priority:			Event priority
- * led_user_data_offset:	Offset to user data
- * led_user_data_size:		Size of user data
- * led_patterns_number:		Number of patterns in the event
- * led_body:				Pattern and user data
- */
-struct lib_event_data {
-	struct res_header		led_head;
-	struct in_addr			led_in_addr;
-	SaTimeT					led_receive_time;
-	uint32_t				led_svr_channel_handle;
-	uint32_t				led_lib_channel_handle;
-	SaNameT					led_chan_name;
-	SaEvtEventIdT			led_event_id;
-	SaEvtSubscriptionIdT	led_sub_id;
-	SaClmNodeIdT			led_publisher_node_id;
-	SaNameT					led_publisher_name;
-	SaTimeT					led_retention_time;
-	SaTimeT					led_publish_time;
-	SaEvtEventPriorityT		led_priority;
-	uint32_t				led_user_data_offset;
-	uint32_t				led_user_data_size;
-	uint32_t				led_patterns_number;
-	uint8_t					led_body[0];
-
-};
-
-/*
- * MESSAGE_RES_EVT_PUBLISH
- *
- * iep_head:		Result head
- * iep_error:		Request results
- * iep_event_id:	Event ID of published message
- *
- */
-struct res_evt_event_publish {
-
-	struct res_header	iep_head;
-	SaEvtEventIdT		iep_event_id;
-};
-
-/*
- * MESSAGE_REQ_EVT_CLEAR_RETENTIONTIME
- *
- * Request message:
- *
- * iec_head:			Request head
- * iec_event_id:		ID of event to clear
- * iec_channel_handle:	Server handle of associate channel
- *
- */
-struct req_evt_event_clear_retentiontime {
-
-	struct req_header	iec_head;
-	SaEvtEventIdT		iec_event_id;
-	uint32_t			iec_channel_handle;
-
-};
-
-/*
- * MESSAGE_RES_EVT_CLEAR_RETENTIONTIME
- *
- * iec_head:		Results head
- * iec_error:		Request result
- *
- */
-struct res_evt_event_clear_retentiontime {
-	struct res_header	iec_head;
-};
-
-
-/*
- * MESSAGE_REQ_EXEC_EVT_CHANCMD
- *
- * chc_header:	Request head
- * chc_chan:	Channel Name
- * chc_op:		Channel operation (open, close, clear retentiontime)
- */
-
-enum evt_chan_ops {
-	EVT_OPEN_CHAN_OP,
-	EVT_CLOSE_CHAN_OP,
-	EVT_CLEAR_RET_OP,
-	EVT_SET_ID_OP,
-	EVT_CONF_DONE,
-	EVT_OPEN_COUNT,
-	EVT_OPEN_COUNT_DONE
-};
-	
-struct evt_set_id {
-	struct in_addr	chc_addr;
-	SaEvtEventIdT	chc_last_id;
-};
-
-struct evt_set_opens {
-	SaNameT		chc_chan_name;
-	uint32_t	chc_open_count;
-};
-
-struct req_evt_chan_command {
-	struct req_header 	chc_head;
-	int 				chc_op;
-	union {
-		SaNameT				chc_chan;
-		SaEvtEventIdT		chc_event_id;
-		struct evt_set_id	chc_set_id;
-		struct evt_set_opens chc_set_opens;
-	} u;
-};
 #endif /* AIS_MSG_H_DEFINED */