From a9c5be2207cf411c96a0a292dbb415b9ca5dcf35 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 17 Jul 2012 17:26:24 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 352b004f..1e7bee69 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: f26c3e9acd1265c78c6ef49d59852244652805a5 -Head: f5a174fea7912e389c7fec5db64e4e39a78573a2 +Previous: 68d86d20f1081a0fdbd509ce754266d47ceebd31 +Head: 458b5b28ee499150480de42cc848ce119c208967 Applied: transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6 fork: c86c2d8e7d556ae2d94b3181939473a50337e550 rstream-fork: f5a174fea7912e389c7fec5db64e4e39a78573a2 + refresh-temp: 458b5b28ee499150480de42cc848ce119c208967 Unapplied: waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..b6781356 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,45 @@ +Bottom: 2204d8d10b55cf98a31f8770863429936247a266 +Top: a625ed79a630be511a10aa72ac56ee50cd156f44 +Author: Sean Hefty +Date: 2012-07-17 17:26:24 -0700 + +Refresh of rstream-fork + +--- + +diff --git a/examples/rstream.c b/examples/rstream.c +index 70bd252..8595657 100644 +--- a/examples/rstream.c ++++ b/examples/rstream.c +@@ -467,7 +467,6 @@ static int server_connect(void) + + if (use_fork) + fork_pid = fork(); +- + if (!fork_pid) + set_options(rs); + return ret; +@@ -558,10 +557,11 @@ static int run(void) + init_latency_test(test_size[i].size); + run_test(); + } +- rs_shutdown(rs, SHUT_RDWR); ++ if (!fork_pid) ++ rs_shutdown(rs, SHUT_RDWR); + rs_close(rs); + +- if (use_fork && !fork_pid) ++ if (!dst_addr && use_fork && !fork_pid) + goto free; + + optimization = opt_bandwidth; +@@ -583,7 +583,8 @@ static int run(void) + ret = run_test(); + } + +- rs_shutdown(rs, SHUT_RDWR); ++ if (!fork_pid) ++ rs_shutdown(rs, SHUT_RDWR); + rs_close(rs); + free: + free(buf); -- 2.41.0