net: splitting contmng and netbench libraries, simplyfing dependencies

Signed-off-by: Adam Turowski <adam.turowski@inf.ethz.ch>

diff --git a/hake/RuleDefs.hs b/hake/RuleDefs.hs
index 9132774..ff7b516 100644 (file)
--- a/hake/RuleDefs.hs
+++ b/hake/RuleDefs.hs
@@ -1230,9 +1230,9 @@ data LibDepTree = LibDep String | LibDeps [LibDepTree] deriving (Show,Eq)
 libposixcompat_deps   = LibDeps [ LibDep "posixcompat",
                                   (libvfs_deps_all "vfs"), LibDep "term_server" ]
 liblwip_deps          = LibDeps $ [ LibDep x | x <- deps ]
-    where deps = ["lwip" ,"contmng" ,"net_if_raw" ,"timer" ,"hashtable"]
+    where deps = ["lwip" ,"net_if_raw" ,"timer" ,"hashtable"]
 libnetQmng_deps       = LibDeps $ [ LibDep x | x <- deps ]
-    where deps = ["net_queue_manager", "contmng" ,"procon" , "net_if_raw", "bfdmuxvm"]
+    where deps = ["net_queue_manager"]
 libnfs_deps           = LibDeps $ [ LibDep "nfs", liblwip_deps]
 libssh_deps           = LibDeps [ libposixcompat_deps, libopenbsdcompat_deps,
                                   LibDep "zlib", LibDep "crypto", LibDep "ssh" ]

diff --git a/include/net_queue_manager/net_queue_manager.h b/include/net_queue_manager/net_queue_manager.h
index 92a5613..2db06c6 100644 (file)
--- a/include/net_queue_manager/net_queue_manager.h
+++ b/include/net_queue_manager/net_queue_manager.h
@@ -17,7 +17,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/bulk_transfer.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 #include <procon/procon.h>
 #include <barrelfish/net_constants.h>
 #include <net_interfaces/flags.h>

diff --git a/include/contmng/netbench.h b/include/netbench/netbench.h
similarity index 99%
rename from include/contmng/netbench.h
rename to include/netbench/netbench.h
index 09c8854..9770fa3 100644 (file)
--- a/include/contmng/netbench.h
+++ b/include/netbench/netbench.h
@@ -115,4 +115,4 @@ static inline float in_seconds(uint64_t cycles)
 
 __END_DECLS
 
-#endif // CONTMNG_H_
+#endif // NETBENCH_H_

diff --git a/lib/contmng/Hakefile b/lib/contmng/Hakefile
index 1b1522c..b4a1775 100644 (file)
--- a/lib/contmng/Hakefile
+++ b/lib/contmng/Hakefile
@@ -11,7 +11,7 @@
 --------------------------------------------------------------------------
 
 [ build library { target = "contmng",
-                  cFiles = [ "contmng.c", "netbench.c" ]
+                  cFiles = [ "contmng.c" ]
                 }
 ]
 

diff --git a/lib/lwip/src/barrelfish/idc_barrelfish.c b/lib/lwip/src/barrelfish/idc_barrelfish.c
index e45caa4..05cd522 100644 (file)
--- a/lib/lwip/src/barrelfish/idc_barrelfish.c
+++ b/lib/lwip/src/barrelfish/idc_barrelfish.c
@@ -22,7 +22,7 @@
 #include <trace/trace.h>
 #include <trace_definitions/trace_defs.h>
 #include <contmng/contmng.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 #include <procon/procon.h>
 #include "lwip/pbuf.h"
 #include "lwip/init.h"

diff --git a/lib/lwip/src/barrelfish/idc_net_control.c b/lib/lwip/src/barrelfish/idc_net_control.c
index c8f8141..feff3fe 100644 (file)
--- a/lib/lwip/src/barrelfish/idc_net_control.c
+++ b/lib/lwip/src/barrelfish/idc_net_control.c
@@ -22,7 +22,7 @@
 #include <netif/etharp.h>
 #include <netif/bfeth.h>
 #include "lwip/init.h"
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 #include <if/net_ports_defs.h>
 #include <if/net_ports_rpcclient_defs.h>
 #include <stdio.h>

diff --git a/lib/lwip/src/barrelfish/mem_barrelfish.c b/lib/lwip/src/barrelfish/mem_barrelfish.c
index 078c4df..a02df4a 100644 (file)
--- a/lib/lwip/src/barrelfish/mem_barrelfish.c
+++ b/lib/lwip/src/barrelfish/mem_barrelfish.c
@@ -19,7 +19,7 @@
 #include <barrelfish/bulk_transfer.h>
 #include <barrelfish/sys_debug.h>
 #include <barrelfish/waitset.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/lib/lwip/src/core/init.c b/lib/lwip/src/core/init.c
index ba18fc9..d68f032 100644 (file)
--- a/lib/lwip/src/core/init.c
+++ b/lib/lwip/src/core/init.c
@@ -63,7 +63,7 @@
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/deferred.h>
 #include <barrelfish/net_constants.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 
 
 /* FIXME: Move this to config */

diff --git a/lib/lwip/src/netif/bfeth.c b/lib/lwip/src/netif/bfeth.c
index ad6f38b..a0f841e 100644 (file)
--- a/lib/lwip/src/netif/bfeth.c
+++ b/lib/lwip/src/netif/bfeth.c
@@ -65,7 +65,7 @@
 #include <netif/bfeth.h>
 
 #include <barrelfish/barrelfish.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 #include <idc_barrelfish.h>
 #include <mem_barrelfish.h>
 

diff --git a/lib/net_queue_manager/Hakefile b/lib/net_queue_manager/Hakefile
index 273e2e9..cbe32d9 100644 (file)
--- a/lib/net_queue_manager/Hakefile
+++ b/lib/net_queue_manager/Hakefile
@@ -17,5 +17,5 @@
                   flounderBindings = [ "net_queue_manager",
                                        "net_soft_filters" ],
                   flounderExtraBindings = [ ("net_soft_filters", ["rpcclient"]) ],
-                  addLibraries = [ "procon", "bfdmuxvm", "trace"] }
+                  addLibraries = [ "procon", "netbench", "bfdmuxvm", "trace"] }
 ]

diff --git a/lib/net_queue_manager/QM_benchmark.h b/lib/net_queue_manager/QM_benchmark.h
index e0e9ef5..5804033 100644 (file)
--- a/lib/net_queue_manager/QM_benchmark.h
+++ b/lib/net_queue_manager/QM_benchmark.h
@@ -12,7 +12,7 @@
 #include <barrelfish/barrelfish.h>
 #include <if/net_queue_manager_defs.h>
 #include <net_queue_manager/net_queue_manager.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 #include <stdio.h>
 #include <string.h>
 #include "queue_manager_debug.h"

diff --git a/lib/netbench/Hakefile b/lib/netbench/Hakefile
new file mode 100644 (file)
index 0000000..729492e
--- /dev/null
+++ b/lib/netbench/Hakefile
@@ -0,0 +1,17 @@
+--------------------------------------------------------------------------
+-- Copyright (c) 2007-2009, ETH Zurich.
+-- All rights reserved.
+--
+-- This file is distributed under the terms in the attached LICENSE file.
+-- If you do not find this file, copies can be found by writing to:
+-- ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
+--
+-- Hakefile for lib/contmng
+--
+--------------------------------------------------------------------------
+
+[ build library { target = "netbench",
+                  cFiles = [ "netbench.c" ]
+                }
+]
+

diff --git a/lib/contmng/netbench.c b/lib/netbench/netbench.c
similarity index 99%
rename from lib/contmng/netbench.c
rename to lib/netbench/netbench.c
index 25c955f..972c9c0 100644 (file)
--- a/lib/contmng/netbench.c
+++ b/lib/netbench/netbench.c
@@ -16,7 +16,7 @@
 #ifndef NETBENCH_C_
 #define NETBENCH_C_
 
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 #include <string.h>
 
 #define MACHINE_CLK_UNIT    (1000000)

diff --git a/lib/nfs/rpc.c b/lib/nfs/rpc.c
index 09adbb1..76851a7 100644 (file)
--- a/lib/nfs/rpc.c
+++ b/lib/nfs/rpc.c
@@ -19,7 +19,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <bench/bench.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 
 // XXX: kludge making it possible to use bench_tsc without -lbench
 #if defined(__i386__) || defined(__x86_64__)

diff --git a/usr/drivers/e1000/Hakefile b/usr/drivers/e1000/Hakefile
index e170540..68724b4 100644 (file)
--- a/usr/drivers/e1000/Hakefile
+++ b/usr/drivers/e1000/Hakefile
@@ -12,8 +12,7 @@
 
 [ build application { target = "e1000n",
                       cFiles = [ "e1000n.c", "e1000n_hwinit.c", "e1000n_helpers.c" ],
-                      flounderBindings = [ "net_queue_manager",
-                                            "net_soft_filters", "octopus" ],
+                      flounderBindings = [ "net_queue_manager" ],
                       mackerelDevices = [ "e1000" ],
                       addLibraries = libDeps [ "pci", "netQmng", "trace", "octopus" ],
                       architectures = [ "x86_64" ]
@@ -22,8 +21,7 @@
   build application { target = "e1000n_irqtest",
                       cFiles = [ "e1000n.c", "e1000n_hwinit.c",
                         "e1000n_helpers.c", "test_instr_irqtest.c" ],
-                      flounderBindings = [ "net_queue_manager",
-                                           "net_soft_filters", "octopus" ],
+                      flounderBindings = [ "net_queue_manager" ],
                       mackerelDevices = [ "e1000" ],
                       addLibraries = libDeps [ "pci", "netQmng", "trace", "octopus" ],
                       architectures = [ "x86_64" ],

diff --git a/usr/tests/net_tests/nfs_throughput/nfs_cat.c b/usr/tests/net_tests/nfs_throughput/nfs_cat.c
index ea3fe6c..ab6c826 100644 (file)
--- a/usr/tests/net_tests/nfs_throughput/nfs_cat.c
+++ b/usr/tests/net_tests/nfs_throughput/nfs_cat.c
@@ -25,7 +25,7 @@
 #include <lwip/init.h>
 #include <barrelfish/nameservice_client.h>
 #include <barrelfish/waitset.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 
 #define MOUNT_DIR   "/nfs"
 

diff --git a/usr/tests/net_tests/udp_throughput/udp_test.c b/usr/tests/net_tests/udp_throughput/udp_test.c
index 588c33c..e209ebc 100644 (file)
--- a/usr/tests/net_tests/udp_throughput/udp_test.c
+++ b/usr/tests/net_tests/udp_throughput/udp_test.c
@@ -23,7 +23,7 @@
 #include <lwip/udp.h>
 #include <lwip/init.h>
 #include <netif/etharp.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 
 /* Enable tracing only when it is globally enabled */
 #if CONFIG_TRACE && NETWORK_STACK_BENCHMARK

diff --git a/usr/webserver/http_cache.c b/usr/webserver/http_cache.c
index 5ff824d..bca0540 100644 (file)
--- a/usr/webserver/http_cache.c
+++ b/usr/webserver/http_cache.c
@@ -24,7 +24,7 @@
 #include <trace/trace.h>
 #include <trace_definitions/trace_defs.h>
 #include <timer/timer.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 #include "webserver_network.h"
 #include "webserver_debug.h"
 #include "webserver_session.h"

diff --git a/usr/webserver/http_server.c b/usr/webserver/http_server.c
index af58a67..102f1fc 100644 (file)
--- a/usr/webserver/http_server.c
+++ b/usr/webserver/http_server.c
@@ -21,7 +21,7 @@
 #include <barrelfish/barrelfish.h>
 #include <lwip/tcp.h>
 #include <lwip/init.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 
 #include "http_cache.h"
 #include "webserver_network.h"

diff --git a/usr/webserver/main.c b/usr/webserver/main.c
index 62ae44d..ea5f442 100644 (file)
--- a/usr/webserver/main.c
+++ b/usr/webserver/main.c
@@ -22,7 +22,7 @@
 #include <lwip/init.h>
 #include <lwip/tcp.h>
 #include <netif/bfeth.h>
-#include <contmng/netbench.h>
+#include <netbench/netbench.h>
 #include <trace/trace.h>
 #include <trace_definitions/trace_defs.h>