From ff0ac5b0e7f9163760b2863f48389e4943ac2154 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 24 May 2007 11:09:37 +0000 Subject: r23112: Trim down the message.c API slightly: The messages_pending_for_pid is now replaced by MSG_FLAG_LOWPRIORITY or'ed into the msg_type. To enable this, changed the msg_type definitions to hexadecimal. This way we could theoretically add the MSG_FLAG_NODUPLICATES again, but I would rather not do this, because that one is racy and can't be guaranteed at all. (This used to be commit 3f5eb8a9600839a9f9c44c553f0bda6df22b30b0) --- source3/include/messages.h | 114 +++++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 51 deletions(-) (limited to 'source3/include') diff --git a/source3/include/messages.h b/source3/include/messages.h index 6e4cf13098..46c4660936 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -22,79 +22,93 @@ #ifndef _MESSAGES_H_ #define _MESSAGES_H_ +#define MSG_TYPE_MASK 0xFFFF + /* general messages */ -#define MSG_DEBUG 1 -#define MSG_PING 2 -#define MSG_PONG 3 -#define MSG_PROFILE 4 -#define MSG_REQ_DEBUGLEVEL 5 -#define MSG_DEBUGLEVEL 6 -#define MSG_REQ_PROFILELEVEL 7 -#define MSG_PROFILELEVEL 8 -#define MSG_REQ_POOL_USAGE 9 -#define MSG_POOL_USAGE 10 +#define MSG_DEBUG 0x0001 +#define MSG_PING 0x0002 +#define MSG_PONG 0x0003 +#define MSG_PROFILE 0x0004 +#define MSG_REQ_DEBUGLEVEL 0x0005 +#define MSG_DEBUGLEVEL 0x0006 +#define MSG_REQ_PROFILELEVEL 0x0007 +#define MSG_PROFILELEVEL 0x0008 +#define MSG_REQ_POOL_USAGE 0x0009 +#define MSG_POOL_USAGE 0x000A /* If dmalloc is included, set a steady-state mark */ -#define MSG_REQ_DMALLOC_MARK 11 +#define MSG_REQ_DMALLOC_MARK 0x000B /* If dmalloc is included, dump to the dmalloc log a description of * what has changed since the last MARK */ -#define MSG_REQ_DMALLOC_LOG_CHANGED 12 +#define MSG_REQ_DMALLOC_LOG_CHANGED 0x000C -#define MSG_SHUTDOWN 13 +#define MSG_SHUTDOWN 0x000D /* nmbd messages */ -#define MSG_FORCE_ELECTION 1001 -#define MSG_WINS_NEW_ENTRY 1002 -#define MSG_SEND_PACKET 1003 +#define MSG_FORCE_ELECTION 0x0101 +#define MSG_WINS_NEW_ENTRY 0x0102 +#define MSG_SEND_PACKET 0x0103 /* printing messages */ /* #define MSG_PRINTER_NOTIFY 2001*/ /* Obsolete */ -#define MSG_PRINTER_NOTIFY2 2002 +#define MSG_PRINTER_NOTIFY2 0x0202 -#define MSG_PRINTER_DRVUPGRADE 2101 -#define MSG_PRINTERDATA_INIT_RESET 2102 -#define MSG_PRINTER_UPDATE 2103 -#define MSG_PRINTER_MOD 2104 +#define MSG_PRINTER_DRVUPGRADE 0x0203 +#define MSG_PRINTERDATA_INIT_RESET 0x0204 +#define MSG_PRINTER_UPDATE 0x0205 +#define MSG_PRINTER_MOD 0x0206 /* smbd messages */ -#define MSG_SMB_CONF_UPDATED 3001 -#define MSG_SMB_FORCE_TDIS 3002 -#define MSG_SMB_SAM_SYNC 3003 -#define MSG_SMB_SAM_REPL 3004 -#define MSG_SMB_UNLOCK 3005 -#define MSG_SMB_BREAK_REQUEST 3006 -#define MSG_SMB_BREAK_RESPONSE 3007 -#define MSG_SMB_ASYNC_LEVEL2_BREAK 3008 -#define MSG_SMB_OPEN_RETRY 3009 -#define MSG_SMB_KERNEL_BREAK 3010 -#define MSG_SMB_FILE_RENAME 3011 -#define MSG_SMB_INJECT_FAULT 3012 -#define MSG_SMB_BLOCKING_LOCK_CANCEL 3013 -#define MSG_SMB_NOTIFY 3014 -#define MSG_SMB_STAT_CACHE_DELETE 3015 +#define MSG_SMB_CONF_UPDATED 0x0301 +#define MSG_SMB_FORCE_TDIS 0x0302 +#define MSG_SMB_SAM_SYNC 0x0303 +#define MSG_SMB_SAM_REPL 0x0304 +#define MSG_SMB_UNLOCK 0x0305 +#define MSG_SMB_BREAK_REQUEST 0x0306 +#define MSG_SMB_BREAK_RESPONSE 0x0307 +#define MSG_SMB_ASYNC_LEVEL2_BREAK 0x0308 +#define MSG_SMB_OPEN_RETRY 0x0309 +#define MSG_SMB_KERNEL_BREAK 0x030A +#define MSG_SMB_FILE_RENAME 0x030B +#define MSG_SMB_INJECT_FAULT 0x030C +#define MSG_SMB_BLOCKING_LOCK_CANCEL 0x030D +#define MSG_SMB_NOTIFY 0x030E +#define MSG_SMB_STAT_CACHE_DELETE 0x030F /* * Samba4 compatibility */ -#define MSG_PVFS_NOTIFY 3016 +#define MSG_PVFS_NOTIFY 0x0310 /* winbind messages */ -#define MSG_WINBIND_FINISHED 4001 -#define MSG_WINBIND_FORGET_STATE 4002 -#define MSG_WINBIND_ONLINE 4003 -#define MSG_WINBIND_OFFLINE 4004 -#define MSG_WINBIND_ONLINESTATUS 4005 -#define MSG_WINBIND_TRY_TO_GO_ONLINE 4006 -#define MSG_WINBIND_FAILED_TO_GO_ONLINE 4007 +#define MSG_WINBIND_FINISHED 0x0401 +#define MSG_WINBIND_FORGET_STATE 0x0402 +#define MSG_WINBIND_ONLINE 0x0403 +#define MSG_WINBIND_OFFLINE 0x0404 +#define MSG_WINBIND_ONLINESTATUS 0x0405 +#define MSG_WINBIND_TRY_TO_GO_ONLINE 0x0406 +#define MSG_WINBIND_FAILED_TO_GO_ONLINE 0x0407 + +/* + * Special flags passed to message_send. Allocated from the top, lets see when + * it collides with the message types in the lower 16 bits :-) + */ + +/* + * Under high load, this message can be dropped. Use for notify-style + * messages that are not critical for correct operation. + */ +#define MSG_FLAG_LOWPRIORITY 0x80000000 + /* Flags to classify messages - used in message_send_all() */ /* Sender will filter by flag. */ -#define FLAG_MSG_GENERAL 0x0001 -#define FLAG_MSG_SMBD 0x0002 -#define FLAG_MSG_NMBD 0x0004 -#define FLAG_MSG_PRINT_NOTIFY 0x0008 -#define FLAG_MSG_PRINT_GENERAL 0x0010 +#define FLAG_MSG_GENERAL 0x0001 +#define FLAG_MSG_SMBD 0x0002 +#define FLAG_MSG_NMBD 0x0004 +#define FLAG_MSG_PRINT_NOTIFY 0x0008 +#define FLAG_MSG_PRINT_GENERAL 0x0010 struct server_id { pid_t pid; @@ -103,8 +117,6 @@ struct server_id { struct messaging_context; struct data_blob; -unsigned int messages_pending_for_pid(struct messaging_context *msg_ctx, - struct server_id pid); void message_dispatch(struct messaging_context *msg_ctx); BOOL message_send_all(struct messaging_context *msg_ctx, int msg_type, -- cgit