Attachment #127681 for bug #171544

View | Details | Raw Unified | Return to bug 171544
Collapse All | Expand All

Lines 6-12 Link Here

(-)./Makefile 2012-09-11 08:57:58.000000000 -0400 (-3 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= openvswitch	8	PORTNAME= openvswitch
9	PORTVERSION= 1.7.0	9	PORTVERSION= 1.7.1
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= http://openvswitch.org/releases/	11	MASTER_SITES= http://openvswitch.org/releases/
12		12
Lines 46-53 Link Here
46	AUTOTOOLSFILES= aclocal.m4	46	AUTOTOOLSFILES= aclocal.m4
47		47
48	post-patch:	48	post-patch:
49	@${REINPLACE_CMD} -e 's\|1.11.1\|%%AUTOMAKE_APIVER%%\|g' \	49	@${REINPLACE_CMD} -e 's\|1.11.3\|%%AUTOMAKE_APIVER%%\|g' \
50	-e 's\|2.65\|%%AUTOCONF_VERSION%%\|g' \	50	-e 's\|2.68\|%%AUTOCONF_VERSION%%\|g' \
51	.if ${PORT_OPTIONS:MTHREADED}	51	.if ${PORT_OPTIONS:MTHREADED}
Lines 58-61 Link Here
58	post-install:	58	post-install:
59		59
		60	regression-test: build
		61	@cd ${WRKSRC} && ${GMAKE} check
		62
60	.include <bsd.port.post.mk>	63	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)./distinfo 2012-09-10 16:25:26.000000000 -0400 (-2 / +2 lines)
1	SHA256 (openvswitch-1.7.0.tar.gz) = 8e3942cbce80048fb2ce8077be5d35bbe50bb12a1feba33d7c1db68ce711eb53	1	SHA256 (openvswitch-1.7.1.tar.gz) = a31fdae8400e9a1af89bd9031c83de15d4ba6dc2fb3ff92e5bf772577fa1c882
2	SIZE (openvswitch-1.7.0.tar.gz) = 2154289	2	SIZE (openvswitch-1.7.1.tar.gz) = 2153423

Lines 2468-2474 Link Here

(-)./files/patch-bsd-netdev.diff 2012-09-11 10:02:57.000000000 -0400 (-1 / +3 lines)
2468	index 0000000..c145091	2468	index 0000000..c145091
2469	--- /dev/null	2469	--- /dev/null
2470	+++ lib/route-table-bsd.c	2470	+++ lib/route-table-bsd.c
2471	@@ -0,0 +1,129 @@	2471	@@ -0,0 +1,131 @@
2472	+/*	2472	+/*
2473	+ * Copyright (c) 2012 Ed Maste. All rights reserved.	2473	+ * Copyright (c) 2012 Ed Maste. All rights reserved.
2474	+ *	2474	+ *
Lines 2500-2505 Link Here
2500	+#include <string.h>	2500	+#include <string.h>
2501	+#include <unistd.h>	2501	+#include <unistd.h>
2502	+	2502	+
		2503	+#include "vlog.h"
		2504	+
2503	+VLOG_DEFINE_THIS_MODULE(route_table);	2505	+VLOG_DEFINE_THIS_MODULE(route_table);
2504	+	2506	+
2505	+static int pid;	2507	+static int pid;




@@ -1003,7 +1209,12 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port,
         return;
     }
     flow_extract(packet, 0, 0, odp_port_to_ofp_port(port->port_no), &key);
+#ifdef THREADED
+    pthread_mutex_lock(&dp->table_mutex);
+    flow = dp_netdev_lookup_flow_locked(dp, &key);

 int netdev_drain(struct netdev *);
 int netdev_send(struct netdev *, const struct ofpbuf *);
diff --git lib/route-table-bsd.c lib/route-table-bsd.c
index c145091..1c29071 100644
--- lib/route-table-bsd.c
+++ lib/route-table-bsd.c
@@ -29,6 +29,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "vlog.h"
+
 VLOG_DEFINE_THIS_MODULE(route_table);
 
 static int pid;
diff --git lib/vlog.c lib/vlog.c
index 899072e..b6bd4ef 100644
--- lib/vlog.c

Return to bug 171544

Lines 453-459 Link Here

(-)./files/threaded.diff 2012-09-11 09:44:45.000000000 -0400 (-14 / +1 lines)
453	@@ -1003,7 +1209,12 @@ dp_netdev_port_input(struct dp_netdev dp, struct dp_netdev_port port,	453	@@ -1003,7 +1209,12 @@ dp_netdev_port_input(struct dp_netdev dp, struct dp_netdev_port port,
454	return;	454	return;
455	}	455	}
456	flow_extract(packet, 0, 0, port->port_no, &key);	456	flow_extract(packet, 0, 0, odp_port_to_ofp_port(port->port_no), &key);
457	+#ifdef THREADED	457	+#ifdef THREADED
458	+ pthread_mutex_lock(&dp->table_mutex);	458	+ pthread_mutex_lock(&dp->table_mutex);
459	+ flow = dp_netdev_lookup_flow_locked(dp, &key);	459	+ flow = dp_netdev_lookup_flow_locked(dp, &key);
Lines 1205-1223 Link Here
1205	int netdev_drain(struct netdev *);	1205	int netdev_drain(struct netdev *);
1206	int netdev_send(struct netdev , const struct ofpbuf );	1206	int netdev_send(struct netdev , const struct ofpbuf );
1207	diff --git lib/route-table-bsd.c lib/route-table-bsd.c
1208	index c145091..1c29071 100644
1209	--- lib/route-table-bsd.c
1210	+++ lib/route-table-bsd.c
1211	@@ -29,6 +29,8 @@
1212	#include <string.h>
1213	#include <unistd.h>
1214
1215	+#include "vlog.h"
1216	+
1217	VLOG_DEFINE_THIS_MODULE(route_table);
1218
1219	static int pid;
1220	diff --git lib/vlog.c lib/vlog.c	1207	diff --git lib/vlog.c lib/vlog.c
1221	index 899072e..b6bd4ef 100644	1208	index 899072e..b6bd4ef 100644
1222	--- lib/vlog.c	1209	--- lib/vlog.c