diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-15 14:39:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:06 -0500 |
| commit | 331041139f2389baab6ba28483121abc31c1a870 (patch) | |
| tree | d4d719104d3a864507af67904c7442265cc036e3 /source3/torture | |
| parent | 63f9607ea7d48ad4bd418fc1135d72215aa05c85 (diff) | |
| download | samba-331041139f2389baab6ba28483121abc31c1a870.tar.gz samba-331041139f2389baab6ba28483121abc31c1a870.tar.bz2 samba-331041139f2389baab6ba28483121abc31c1a870.zip | |
r22906: Some more message_send_pid
(This used to be commit 8abf9f396375b42d838e992b3a4e40e68e550ab2)
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/msgtest.c | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c index 703832c7b4..18674ef0f5 100644 --- a/source3/torture/msgtest.c +++ b/source3/torture/msgtest.c @@ -29,14 +29,19 @@ static int pong_count; /**************************************************************************** a useful function for testing the message system ****************************************************************************/ -static void pong_message(int msg_type, struct server_id src, - void *buf, size_t len, void *private_data) +static void pong_message(struct messaging_context *msg_ctx, + void *private_data, + uint32_t msg_type, + struct server_id pid, + DATA_BLOB *data) { pong_count++; } int main(int argc, char *argv[]) { + struct event_context *evt_ctx; + struct messaging_context *msg_ctx; pid_t pid; int i, n; char buf[12]; @@ -49,6 +54,12 @@ static void pong_message(int msg_type, struct server_id src, message_init(); + if (!(evt_ctx = event_context_init(NULL)) || + !(msg_ctx = messaging_init(NULL, server_id_self(), evt_ctx))) { + fprintf(stderr, "could not init messaging context\n"); + exit(1); + } + if (argc != 3) { fprintf(stderr, "%s: Usage - %s pid count\n", argv[0], argv[0]); @@ -58,10 +69,11 @@ static void pong_message(int msg_type, struct server_id src, pid = atoi(argv[1]); n = atoi(argv[2]); - message_register(MSG_PONG, pong_message, NULL); + messaging_register(msg_ctx, NULL, MSG_PONG, pong_message); for (i=0;i<n;i++) { - message_send_pid(pid_to_procid(pid), MSG_PING, NULL, 0, True); + messaging_send(msg_ctx, pid_to_procid(pid), MSG_PING, + &data_blob_null); } while (pong_count < i) { @@ -75,10 +87,10 @@ static void pong_message(int msg_type, struct server_id src, safe_strcpy(buf, "1234567890", sizeof(buf)-1); for (i=0;i<n;i++) { - message_send_pid(pid_to_procid(getpid()), MSG_PING, - NULL, 0, False); - message_send_pid(pid_to_procid(getpid()), MSG_PING, - buf, 11, False); + messaging_send(msg_ctx, pid_to_procid(getpid()), MSG_PING, + &data_blob_null); + messaging_send_buf(msg_ctx, pid_to_procid(getpid()), MSG_PING, + (uint8 *)buf, 11); } for (i=0;i<n;i++) { @@ -101,13 +113,14 @@ static void pong_message(int msg_type, struct server_id src, printf("Sending pings for %d seconds\n", (int)timelimit); while (timeval_elapsed(&tv) < timelimit) { - if(NT_STATUS_IS_OK(message_send_pid(pid_to_procid(pid), - MSG_PING, - buf, 11, False))) + if(NT_STATUS_IS_OK(messaging_send_buf( + msg_ctx, pid_to_procid(pid), + MSG_PING, + (uint8 *)buf, 11))) ping_count++; - if(NT_STATUS_IS_OK(message_send_pid(pid_to_procid(pid), - MSG_PING, - NULL, 0, False))) + if(NT_STATUS_IS_OK(messaging_send( + msg_ctx, pid_to_procid(pid), + MSG_PING, &data_blob_null))) ping_count++; while (ping_count > pong_count + 20) { |