svn commit: samba r7298 - in branches/SAMBA_4_0/source/lib/messaging: .

[tridge at samba.org]

Author: tridge
Date: 2005-06-05 07:44:51 +0000 (Sun, 05 Jun 2005)
New Revision: 7298

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7298

Log:
ensure messages are sent in order even when under extreme load. This
fixes a IO_TIMEOUT problem in the messaging benchmarks

Modified:
   branches/SAMBA_4_0/source/lib/messaging/irpc.h
   branches/SAMBA_4_0/source/lib/messaging/messaging.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/messaging/irpc.h
===================================================================
--- branches/SAMBA_4_0/source/lib/messaging/irpc.h	2005-06-05 07:40:17 UTC (rev 7297)
+++ branches/SAMBA_4_0/source/lib/messaging/irpc.h	2005-06-05 07:44:51 UTC (rev 7298)
@@ -28,7 +28,7 @@
 };
 
 /* don't allow calls to take too long */
-#define IRPC_CALL_TIMEOUT 20
+#define IRPC_CALL_TIMEOUT 10
 
 
 /* the server function type */

Modified: branches/SAMBA_4_0/source/lib/messaging/messaging.c
===================================================================
--- branches/SAMBA_4_0/source/lib/messaging/messaging.c	2005-06-05 07:40:17 UTC (rev 7297)
+++ branches/SAMBA_4_0/source/lib/messaging/messaging.c	2005-06-05 07:44:51 UTC (rev 7298)
@@ -308,7 +308,12 @@
 	rec->path = messaging_path(msg, server);
 	talloc_steal(rec, rec->path);
 
-	status = try_send(rec);
+	if (msg->pending != NULL) {
+		status = STATUS_MORE_ENTRIES;
+	} else {
+		status = try_send(rec);
+	}
+
 	if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
 		if (msg->pending == NULL) {
 			EVENT_FD_WRITEABLE(msg->event.fde);