diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-18 07:40:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:00:00 -0500 |
| commit | d0cc571e30bf49443ac7d1b1a0b896ee72d7d9a6 (patch) | |
| tree | a0c43b9894da40ab6b78cdad8a6a6964d8067fe7 /source4/include | |
| parent | d37acd0fe71923987a68377bf01040eaed245d9f (diff) | |
| download | samba-d0cc571e30bf49443ac7d1b1a0b896ee72d7d9a6.tar.gz samba-d0cc571e30bf49443ac7d1b1a0b896ee72d7d9a6.tar.bz2 samba-d0cc571e30bf49443ac7d1b1a0b896ee72d7d9a6.zip | |
r3029: implemented byte range lock timeouts.
This adds a pvfs_wait_message() routine which uses the new messaging
system, event timers and talloc destructors to give a nice generic
async event handling system with a easy to use interface. The
extensions to pvfs_lock.c are based on calls to pvfs_wait_message()
routines.
We now pass all of our smbtorture locking tests, although while
writing this code I have thought of some additonal tests that should
be added, particularly for lock cancel operations. I'll work on that
soon.
This commit also extends the smbtorture lock tests to test the rather
weird 0xEEFFFFFF locking semantics that I have discovered in
win2003. Win2003 treats the 0xEEFFFFFF boundary as special, and will
give different error codes on either side of it. Locks on both sides
are allowed, the only difference is which error code is given when a
lock is denied. Anyone like to hazard a guess as to why? It has
me stumped.
(This used to be commit 4395c0557ab175d6a8dd99df03c266325949ffa5)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/messages.h | 46 | ||||
| -rw-r--r-- | source4/include/smb.h | 2 |
2 files changed, 2 insertions, 46 deletions
diff --git a/source4/include/messages.h b/source4/include/messages.h index ce167a772d..3453a52bf1 100644 --- a/source4/include/messages.h +++ b/source4/include/messages.h @@ -26,50 +26,6 @@ #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 - -/* If dmalloc is included, set a steady-state mark */ -#define MSG_REQ_DMALLOC_MARK 11 - -/* 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_SHUTDOWN 13 - -/* Dump out the talloc useage. */ -#define MSG_REQ_TALLOC_USAGE 14 -#define MSG_TALLOC_USAGE 15 - -/* nmbd messages */ -#define MSG_FORCE_ELECTION 1001 -#define MSG_WINS_NEW_ENTRY 1002 - -/* printing messages */ -/* #define MSG_PRINTER_NOTIFY 2001*/ /* Obsolete */ -#define MSG_PRINTER_DRVUPGRADE 2002 -#define MSG_PRINTER_NOTIFY2 2003 -#define MSG_PRINTERDATA_INIT_RESET 2004 - -/* 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 - -/* 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_PRINTING 0x0008 +#define MSG_BRL_RETRY 4 #endif diff --git a/source4/include/smb.h b/source4/include/smb.h index 745e90e4ff..a616f94ea1 100644 --- a/source4/include/smb.h +++ b/source4/include/smb.h @@ -611,6 +611,6 @@ typedef struct nt_user_token { #define REQ_CONTROL_ASYNC (1<<2) /* the backend will answer this one later */ /* passed to br lock code */ -enum brl_type {READ_LOCK, WRITE_LOCK}; +enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK}; #endif /* _SMB_H */ |