summaryrefslogtreecommitdiff
path: root/source3/utils/smbcontrol.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-11-16 21:38:24 +0000
committerJeremy Allison <jra@samba.org>2000-11-16 21:38:24 +0000
commitcdac09614ef426092ed1b1de480fe90c3c4cdd83 (patch)
treee8f51d419cdc238fe9d7c181c1ffe1ee60881265 /source3/utils/smbcontrol.c
parentfb71f4a0affd90102cc7866dfd081c01bf056410 (diff)
downloadsamba-cdac09614ef426092ed1b1de480fe90c3c4cdd83.tar.gz
samba-cdac09614ef426092ed1b1de480fe90c3c4cdd83.tar.bz2
samba-cdac09614ef426092ed1b1de480fe90c3c4cdd83.zip
Fix for a problem with the new messaging system. If a sender is using the
messaging system as a notification mechanism, and the speed of notification greatly exceeds the speed of message recovery, then you get a massively (>75Mb) growing tdb. If the message is a simple notification, then the message is static, and you only need one of them in transit to a target process at any one time. This patch adds a BOOL "allow_duplicates" to the message_send_XX primitives. If set to False, then before sending a message the sender checks the existing message queue for a target pid for a duplicate of this message, and doesn't add to it if one already exists. Also added code into msgtest.c to test this. Jeremy. (This used to be commit 3aa7995660395ecb85c8e35b638fa9fbbb952558)
Diffstat (limited to 'source3/utils/smbcontrol.c')
-rw-r--r--source3/utils/smbcontrol.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index a273f82151..815f9fddff 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -115,13 +115,13 @@ void profilelevel_function(int msg_type, pid_t src, void *buf, size_t len)
/****************************************************************************
send a message to a named destination
****************************************************************************/
-static BOOL send_message(char *dest, int msg_type, void *buf, int len)
+static BOOL send_message(char *dest, int msg_type, void *buf, int len, BOOL duplicates)
{
pid_t pid;
/* "smbd" is the only broadcast operation */
if (strequal(dest,"smbd")) {
- return message_send_all(msg_type, buf, len);
+ return message_send_all(msg_type, buf, len, duplicates);
} else if (strequal(dest,"nmbd")) {
pid = pidfile_pid(dest);
if (pid == 0) {
@@ -136,7 +136,7 @@ static BOOL send_message(char *dest, int msg_type, void *buf, int len)
}
}
- return message_send_pid(pid, msg_type, buf, len);
+ return message_send_pid(pid, msg_type, buf, len, duplicates);
}
/****************************************************************************
@@ -174,7 +174,7 @@ static BOOL do_command(char *dest, char *msg_name, char *params)
return(False);
}
v = atoi(params);
- send_message(dest, MSG_DEBUG, &v, sizeof(int));
+ send_message(dest, MSG_DEBUG, &v, sizeof(int), False);
break;
case MSG_PROFILE:
@@ -195,7 +195,7 @@ static BOOL do_command(char *dest, char *msg_name, char *params)
"MSG_PROFILE parameter must be off, count, on, or flush\n");
return(False);
}
- send_message(dest, MSG_PROFILE, &v, sizeof(int));
+ send_message(dest, MSG_PROFILE, &v, sizeof(int), False);
break;
case MSG_FORCE_ELECTION:
@@ -203,7 +203,7 @@ static BOOL do_command(char *dest, char *msg_name, char *params)
fprintf(stderr,"force-election can only be sent to nmbd\n");
return(False);
}
- send_message(dest, MSG_FORCE_ELECTION, NULL, 0);
+ send_message(dest, MSG_FORCE_ELECTION, NULL, 0, False);
break;
case MSG_REQ_PROFILELEVEL:
@@ -212,7 +212,7 @@ static BOOL do_command(char *dest, char *msg_name, char *params)
profilelevel_registered = True;
}
got_level = False;
- retval = send_message(dest, MSG_REQ_PROFILELEVEL, NULL, 0);
+ retval = send_message(dest, MSG_REQ_PROFILELEVEL, NULL, 0, True);
if (retval) {
timeout_start = time(NULL);
while (!got_level) {
@@ -231,7 +231,7 @@ static BOOL do_command(char *dest, char *msg_name, char *params)
debuglevel_registered = True;
}
got_level = False;
- retval = send_message(dest, MSG_REQ_DEBUGLEVEL, NULL, 0);
+ retval = send_message(dest, MSG_REQ_DEBUGLEVEL, NULL, 0, True);
if (retval) {
timeout_start = time(NULL);
while (!got_level) {
@@ -254,7 +254,7 @@ static BOOL do_command(char *dest, char *msg_name, char *params)
return (False);
}
retval = send_message(dest, MSG_PRINTER_NOTIFY, params,
- strlen(params) + 1);
+ strlen(params) + 1, False);
break;
case MSG_PING:
@@ -269,7 +269,7 @@ static BOOL do_command(char *dest, char *msg_name, char *params)
n = atoi(params);
pong_count = 0;
for (i=0;i<n;i++) {
- retval = send_message(dest, MSG_PING, NULL, 0);
+ retval = send_message(dest, MSG_PING, NULL, 0, True);
if (retval == False) break;
}
if (retval) {