Attachment 158327 Details for Bug 244708 – Working nagle patch

[patch] Working nagle patch

lowcomms.nagle.patch (text/plain), 3.69 KB, created by Christine Caulfield on 2007-07-02 10:47:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2007-07-02 10:47:07 UTC

Size: 3.69 KB

patch

obsolete

>? dlm-kernel/src/.ast.o.cmd
>? dlm-kernel/src/.config.o.cmd
>? dlm-kernel/src/.device.o.cmd
>? dlm-kernel/src/.dir.o.cmd
>? dlm-kernel/src/.dlm.ko.cmd
>? dlm-kernel/src/.dlm.mod.o.cmd
>? dlm-kernel/src/.dlm.o.cmd
>? dlm-kernel/src/.lkb.o.cmd
>? dlm-kernel/src/.locking.o.cmd
>? dlm-kernel/src/.lockqueue.c.swp
>? dlm-kernel/src/.lockqueue.o.cmd
>? dlm-kernel/src/.lockspace.o.cmd
>? dlm-kernel/src/.lowcomms.o.cmd
>? dlm-kernel/src/.main.o.cmd
>? dlm-kernel/src/.memory.o.cmd
>? dlm-kernel/src/.midcomms.o.cmd
>? dlm-kernel/src/.nfs00000000013b437500000001
>? dlm-kernel/src/.nodes.o.cmd
>? dlm-kernel/src/.proc.o.cmd
>? dlm-kernel/src/.queries.o.cmd
>? dlm-kernel/src/.rebuild.o.cmd
>? dlm-kernel/src/.reccomms.o.cmd
>? dlm-kernel/src/.recover.o.cmd
>? dlm-kernel/src/.recoverd.o.cmd
>? dlm-kernel/src/.rsb.o.cmd
>? dlm-kernel/src/.tmp_versions
>? dlm-kernel/src/.util.o.cmd
>? dlm-kernel/src/cnxman-socket.h
>? dlm-kernel/src/cnxman.h
>? dlm-kernel/src/dlm.ko
>? dlm-kernel/src/dlm.mod.c
>? dlm-kernel/src/lowcomms.c.chrissie
>? dlm-kernel/src/lowcomms.c.debug
>? dlm-kernel/src/lowcomms.c.pjc
>? dlm-kernel/src/lowcomms.c.printks
>? dlm-kernel/src/lowcomms.c.sctp
>? dlm-kernel/src/service.h
>Index: dlm-kernel/src/config.c
>===================================================================
>RCS file: /cvs/cluster/cluster/dlm-kernel/src/Attic/config.c,v
>retrieving revision 1.6.2.1
>diff -u -p -r1.6.2.1 config.c
>--- dlm-kernel/src/config.c	10 May 2005 14:42:53 -0000	1.6.2.1
>+++ dlm-kernel/src/config.c	2 Jul 2007 10:44:11 -0000
>@@ -20,6 +20,7 @@
> 
> /* Config file defaults */
> #define DEFAULT_TCP_PORT       21064
>+#define DEFAULT_TCP_NODELAY        0
> #define DEFAULT_LOCK_TIMEOUT      30
> #define DEFAULT_BUFFER_SIZE     4096
> #define DEFAULT_RSBTBL_SIZE      256
>@@ -31,6 +32,7 @@
> 
> struct config_info dlm_config = {
> 	.tcp_port = DEFAULT_TCP_PORT,
>+	.tcp_nodelay = DEFAULT_TCP_NODELAY,
> 	.lock_timeout = DEFAULT_LOCK_TIMEOUT,
> 	.buffer_size = DEFAULT_BUFFER_SIZE,
> 	.rsbtbl_size = DEFAULT_RSBTBL_SIZE,
>@@ -51,6 +53,10 @@ static struct config_proc_info {
> 	.value = &dlm_config.tcp_port,
>     },
>     {
>+	.name = "tcp_nodelay",
>+	.value = &dlm_config.tcp_nodelay,
>+    },
>+    {
> 	.name = "lock_timeout",
> 	.value = &dlm_config.lock_timeout,
>     },
>Index: dlm-kernel/src/config.h
>===================================================================
>RCS file: /cvs/cluster/cluster/dlm-kernel/src/Attic/config.h,v
>retrieving revision 1.6
>diff -u -p -r1.6 config.h
>--- dlm-kernel/src/config.h	4 Oct 2004 07:51:33 -0000	1.6
>+++ dlm-kernel/src/config.h	2 Jul 2007 10:44:11 -0000
>@@ -16,6 +16,7 @@
> 
> struct config_info {
> 	int tcp_port;
>+	int tcp_nodelay;
> 	int lock_timeout;
> 	int buffer_size;
> 	int rsbtbl_size;
>Index: dlm-kernel/src/lowcomms.c
>===================================================================
>RCS file: /cvs/cluster/cluster/dlm-kernel/src/Attic/lowcomms.c,v
>retrieving revision 1.22.2.14
>diff -u -p -r1.22.2.14 lowcomms.c
>--- dlm-kernel/src/lowcomms.c	27 Jun 2007 10:39:40 -0000	1.22.2.14
>+++ dlm-kernel/src/lowcomms.c	2 Jul 2007 10:44:11 -0000
>@@ -584,6 +584,16 @@ static int connect_to_sock(struct connec
> 
> 	make_sockaddr(&saddr, dlm_config.tcp_port, &addr_len);
> 
>+	if (dlm_config.tcp_nodelay) {
>+		int one = 1;
>+		mm_segment_t fs;
>+
>+		fs = get_fs();
>+		set_fs(get_ds());
>+
>+		tcp_setsockopt(sock->sk, SOL_TCP, TCP_NODELAY, (char *)&one, sizeof(one));
>+		set_fs(fs);
>+	}
> 	add_sock(sock, con);
> 
> 	log_debug2("connecting to %d", con->nodeid);
>@@ -639,6 +649,10 @@ static struct socket *create_listen_sock
> 
> 	fs = get_fs();
> 	set_fs(get_ds());
>+
>+	if (dlm_config.tcp_nodelay)
>+		result = tcp_setsockopt(sock->sk, SOL_TCP, TCP_NODELAY, (char *)&one, sizeof(one));
>+
> 	result = sock_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one));
> 	set_fs(fs);
> 	if (result < 0) {

Actions: View | Diff

Attachments on bug 244708: 157305 | 157306 | 157391 | 157531 | 157628 | 158189 | 158327