diff options
author | Volker Lendecke <vlendec@samba.org> | 2007-05-21 22:17:13 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:17 -0500 |
commit | eaefd00563173dfabb7716c5695ac0a2f7139bb6 (patch) | |
tree | 71efc96a8e35942cc09a164cb1bc0fd2d5abe990 /source/include | |
parent | f53aa56998411b90de238e12e9c3de7f2ff0d2b6 (diff) | |
download | samba-eaefd00563173dfabb7716c5695ac0a2f7139bb6.tar.gz samba-eaefd00563173dfabb7716c5695ac0a2f7139bb6.tar.xz samba-eaefd00563173dfabb7716c5695ac0a2f7139bb6.zip |
r23055: Rewrite messages.c to use auto-generated marshalling in the tdb. I'm
doing this because for the clustering the marshalling is needed in more
than one place, so I wanted a decent routine to marshall a message_rec
struct which was not there before.
Tridge, this seems about the same speed as it used to be before, the
librpc/ndr overhead in my tests was under the noise.
Volker
Diffstat (limited to 'source/include')
-rw-r--r-- | source/include/includes.h | 2 | ||||
-rw-r--r-- | source/include/messages.h | 33 | ||||
-rw-r--r-- | source/include/smb.h | 5 |
3 files changed, 36 insertions, 4 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index 1fa3aae8f79..bbce3bdb5c8 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -648,13 +648,13 @@ typedef int BOOL; #include "trans2.h" #include "nterr.h" #include "ntioctl.h" -#include "messages.h" #include "charset.h" #include "dynconfig.h" #include "util_getent.h" #include "debugparse.h" #include "version.h" #include "privileges.h" +#include "messages.h" #include "locking.h" #include "smb.h" #include "ads_cldap.h" diff --git a/source/include/messages.h b/source/include/messages.h index e3f29832add..6e4cf130986 100644 --- a/source/include/messages.h +++ b/source/include/messages.h @@ -100,4 +100,37 @@ struct server_id { pid_t pid; }; +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, + const void *buf, size_t len, + int *n_sent); +void message_block(void); +void message_unblock(void); +struct event_context *messaging_event_context(struct messaging_context *msg_ctx); +struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, + struct server_id server_id, + struct event_context *ev); +NTSTATUS messaging_register(struct messaging_context *msg_ctx, + void *private_data, + uint32_t msg_type, + void (*fn)(struct messaging_context *msg, + void *private_data, + uint32_t msg_type, + struct server_id server_id, + struct data_blob *data)); +void messaging_deregister(struct messaging_context *ctx, uint32_t msg_type, + void *private_data); +NTSTATUS messaging_send(struct messaging_context *msg_ctx, + struct server_id server, + uint32_t msg_type, const struct data_blob *data); +NTSTATUS messaging_send_buf(struct messaging_context *msg_ctx, + struct server_id server, uint32_t msg_type, + const uint8 *buf, size_t len); + #endif diff --git a/source/include/smb.h b/source/include/smb.h index 1a5b43e564b..a7d63a6aeda 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -425,7 +425,6 @@ struct fd_handle { unsigned long file_id; }; -struct messaging_context; struct event_context; struct fd_event; struct timed_event; @@ -532,10 +531,10 @@ typedef struct files_struct { #include "sysquotas.h" /* used to hold an arbitrary blob of data */ -typedef struct data_blob_ { +typedef struct data_blob { uint8 *data; size_t length; - void (*free)(struct data_blob_ *data_blob); + void (*free)(struct data_blob *data_blob); } DATA_BLOB; extern const DATA_BLOB data_blob_null; |