From dfd69e3582af6edbfdaed2df47a0d19e8af5ecbe Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 4 Feb 2013 17:07:15 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 28 ---------------------------- patches/rstream-cnt | 17 +++++++++++++---- 3 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 16d586f3..71eb9309 100644 --- a/meta +++ b/meta @@ -1,10 +1,9 @@ Version: 1 -Previous: 639011a1103d8a427453846735de10164826ba38 -Head: ce6407272869ce1970e6206cea7292374f53b067 +Previous: 434db44cab073384a5ff0775729aabb26bac6e03 +Head: e7115c7b701f106a18b33f2248de088b87c91eb4 Applied: kern-bug: 69fadb50636d98de57c9069b83adf6d2c5c77fc6 - rstream-cnt: 483e1d88f7758d9072f94e1a764acf247e32e703 - refresh-temp: ce6407272869ce1970e6206cea7292374f53b067 + rstream-cnt: e7115c7b701f106a18b33f2248de088b87c91eb4 Unapplied: af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 3989d5fc..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,28 +0,0 @@ -Bottom: e2c0014c734beb600d34d764ea62c999ea687c38 -Top: a53de8f238f7910f979bb53f53f025f799110f93 -Author: Sean Hefty -Date: 2013-02-04 17:07:14 -0800 - -Refresh of rstream-cnt - ---- - -diff --git a/examples/common.c b/examples/common.c -index 294dba1..28c0fb6 100644 ---- a/examples/common.c -+++ b/examples/common.c -@@ -117,11 +117,11 @@ void cnt_str(char *str, size_t ssize, long long cnt) - - int size_to_count(int size) - { -- if (size >= 1000000) -+ if (size >= (1 << 20)) - return 100; -- else if (size >= 100000) -+ else if (size >= (1 << 16)) - return 1000; -- else if (size >= 10000) -+ else if (size >= (1 << 11)) - return 10000; - else - return 100000; diff --git a/patches/rstream-cnt b/patches/rstream-cnt index 41710bea..38ec4970 100644 --- a/patches/rstream-cnt +++ b/patches/rstream-cnt @@ -1,5 +1,5 @@ Bottom: 63d9ee86b7812695228cc4f4018bf998f3eaaa39 -Top: e2c0014c734beb600d34d764ea62c999ea687c38 +Top: a53de8f238f7910f979bb53f53f025f799110f93 Author: Sean Hefty Date: 2013-02-04 16:52:18 -0800 @@ -17,12 +17,21 @@ Signed-off-by: Sean Hefty --- diff --git a/examples/common.c b/examples/common.c -index 939f50c..294dba1 100644 +index 939f50c..28c0fb6 100644 --- a/examples/common.c +++ b/examples/common.c -@@ -123,10 +123,8 @@ int size_to_count(int size) +@@ -117,16 +117,14 @@ void cnt_str(char *str, size_t ssize, long long cnt) + + int size_to_count(int size) + { +- if (size >= 1000000) ++ if (size >= (1 << 20)) + return 100; +- else if (size >= 100000) ++ else if (size >= (1 << 16)) return 1000; - else if (size >= 10000) +- else if (size >= 10000) ++ else if (size >= (1 << 11)) return 10000; - else if (size >= 1000) - return 100000; -- 2.46.0