May 2012 - tor-commits - lists.torproject.org

[tor/master] Fix issues found by nickm.
by nickm＠torproject.org 11 May '12

11 May '12

commit 6d2898607bd831944c6c15b6e15200a426149811 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 12 22:42:37 2012 +0200 Fix issues found by nickm. * Document fmt_addr_impl() and friends. * Parenthesize macro arguments. * Rename get_first_listener_addrport_for_pt() to get_first_listener_addrport_string(). * Handle port_cfg_t with no_listen. * Handle failure of router_get_active_listener_port_by_type(). * Add an XXX to router_get_active_listener_port_by_type(). --- src/common/address.c | 13 +++++++++---- src/common/address.h | 9 +++++++-- src/or/config.c | 14 ++++++++++---- src/or/config.h | 2 +- src/or/router.c | 2 ++ src/or/transports.c | 2 +- 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 62cf16c..7f78d1e 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -986,10 +986,15 @@ tor_dup_addr(const tor_addr_t *addr) } } -/** Return a string representing the address addr. This string is - * statically allocated, and must not be freed. Each call to - * fmt_addr invalidates the last result of the function. This - * function is not thread-safe. */ +/** Return a string representing the address addr. This string + * is statically allocated, and must not be freed. Each call to + * fmt_addr_impl invalidates the last result of the function. + * This function is not thread-safe. If decorate is set, add + * brackets to IPv6 addresses. + * + * It's better to use the wrapper macros of this function: + * fmt_addr() and fmt_and_decorate_addr(). + */ const char * fmt_addr_impl(const tor_addr_t *addr, int decorate) { diff --git a/src/common/address.h b/src/common/address.h index bdb14eb..761eed6 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -135,8 +135,13 @@ tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u) int tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr_out); char *tor_dup_addr(const tor_addr_t *addr) ATTR_MALLOC; -#define fmt_addr(a) fmt_addr_impl(a, 0) -#define fmt_and_decorate_addr(a) fmt_addr_impl(a, 1) + +/** Wrapper function of fmt_addr_impl(). It does not decorate IPv6 + * addresses. */ +#define fmt_addr(a) fmt_addr_impl((a), 0) +/** Wrapper function of fmt_addr_impl(). It decorates IPv6 + * addresses. */ +#define fmt_and_decorate_addr(a) fmt_addr_impl((a), 1) const char *fmt_addr_impl(const tor_addr_t *addr, int decorate); const char * fmt_addr32(uint32_t addr); int get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr); diff --git a/src/or/config.c b/src/or/config.c index 5ea1f5e..3fc543c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6033,9 +6033,10 @@ get_configured_ports(void) * caller to free it after use. * * This function is meant to be used by the pluggable transport proxy - * spawning code. */ + * spawning code, please make sure that it fits your purposes before + * using it. */ char * -get_first_listener_addrport_for_pt(int listener_type) +get_first_listener_addrport_string(int listener_type) { static const char *ipv4_localhost = "127.0.0.1"; static const char *ipv6_localhost = "[::1]"; @@ -6047,6 +6048,8 @@ get_first_listener_addrport_for_pt(int listener_type) return NULL; SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) { + if (cfg->no_listen) + continue; if (cfg->type == listener_type && tor_addr_family(&cfg->addr) != AF_UNSPEC) { @@ -6064,10 +6067,13 @@ get_first_listener_addrport_for_pt(int listener_type) /* If a listener is configured with port 'auto', we are forced to iterate all listener connections and find out in which port it ended up listening: */ - if (cfg->port == CFG_AUTO_PORT) + if (cfg->port == CFG_AUTO_PORT) { port = router_get_active_listener_port_by_type(listener_type); - else + if (!port) + return NULL; + } else { port = cfg->port; + } tor_asprintf(&string, "%s:%u", address, port); diff --git a/src/or/config.h b/src/or/config.h index fd84d9b..0495186 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -72,7 +72,7 @@ int get_first_advertised_port_by_type_af(int listener_type, #define get_primary_dir_port() \ (get_first_advertised_port_by_type_af(CONN_TYPE_DIR_LISTENER, AF_INET)) -char *get_first_listener_addrport_for_pt(int listener_type); +char *get_first_listener_addrport_string(int listener_type); int options_need_geoip_info(const or_options_t *options, const char **reason_out); diff --git a/src/or/router.c b/src/or/router.c index 67d26e1..3b97d28 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1218,6 +1218,8 @@ consider_publishable_server(int force) /** Return the port of the first active listener of type * listener_type. */ +/** XXX not a very good interface. it's not reliable when there are + multiple listeners. */ uint16_t router_get_active_listener_port_by_type(int listener_type) { diff --git a/src/or/transports.c b/src/or/transports.c index 1f21493..8976450 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -992,7 +992,7 @@ create_managed_proxy_environment(const managed_proxy_t *mp) if (mp->is_server) { { - char *orport_tmp = get_first_listener_addrport_for_pt(CONN_TYPE_OR_LISTENER); + char *orport_tmp = get_first_listener_addrport_string(CONN_TYPE_OR_LISTENER); smartlist_add_asprintf(envs, "TOR_PT_ORPORT=%s", orport_tmp); tor_free(orport_tmp); }

1 0

[tor/master] Merge remote-tracking branch 'asn/bug4865_take2'
by nickm＠torproject.org 11 May '12

11 May '12

commit e0655708a20069a5f42476a25d62e9d3f8138d8c Merge: 84ddc4b 6d28986 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 11:52:51 2012 -0400 Merge remote-tracking branch 'asn/bug4865_take2' changes/bug4865 | 4 +++ src/common/address.c | 17 +++++++++----- src/common/address.h | 9 ++++++- src/or/config.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/config.h | 2 + src/or/router.c | 37 +++++++++++++++++++++---------- src/or/router.h | 1 + src/or/transports.c | 9 ++++--- 8 files changed, 115 insertions(+), 23 deletions(-)

1 0

[tor/master] Fix tor_strtok_r_impl and test cases per bug #5091
by nickm＠torproject.org 11 May '12

11 May '12

commit efb8a09f41fcd4c48bffdc98ae8d5e0002a0bb88 Author: nils <nils(a)shkoo.com> Date: Fri Mar 30 11:01:21 2012 -0400 Fix tor_strtok_r_impl and test cases per bug #5091 == Nick here. I tweaked this patch a little to make it apply cleanly to master, to extract some common code into a function, and to replace snprintf with tor_snprintf. -- nickm --- changes/bug5091 | 4 +++ src/common/compat.c | 30 +++++++++++++++++---- src/test/test_util.c | 70 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 74 insertions(+), 30 deletions(-) diff --git a/changes/bug5091 b/changes/bug5091 new file mode 100644 index 0000000..b9778d7 --- /dev/null +++ b/changes/bug5091 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Make our replacement implementation of strtok_r compatible with + the standard behavior of strtok_r. Patch by nils. Fixes bug + 5091; bugfix on 0.2.2.1-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index 30bde3d..bd68225 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -546,25 +546,43 @@ const char TOR_TOLOWER_TABLE[256] = { 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255, }; +/** Helper for tor_strtok_r_impl: Advances cp past all characters in + * sep, and returns its new value. */ +static char * +strtok_helper(char *cp, const char *sep) +{ + if (sep[1]) { + while (*cp && strchr(sep, *cp)) + ++cp; + } else { + while (*cp && *cp == *sep) + ++cp; + } + return cp; +} + /** Implementation of strtok_r for platforms whose coders haven't figured out * how to write one. Hey guys! You can use this code here for free! */ char * tor_strtok_r_impl(char *str, const char *sep, char **lasts) { char *cp, *start; - if (str) + tor_assert(*sep); + if (str) { + str = strtok_helper(str, sep); + if (!*str) + return NULL; start = cp = *lasts = str; - else if (!*lasts) + } else if (!*lasts || !**lasts) { return NULL; - else + } else { start = cp = *lasts; + } - tor_assert(*sep); if (sep[1]) { while (*cp && !strchr(sep, *cp)) ++cp; } else { - tor_assert(strlen(sep) == 1); cp = strchr(cp, *sep); } @@ -572,7 +590,7 @@ tor_strtok_r_impl(char *str, const char *sep, char **lasts) *lasts = NULL; } else { *cp++ = '\0'; - *lasts = cp; + *lasts = strtok_helper(cp, sep); } return start; } diff --git a/src/test/test_util.c b/src/test/test_util.c index 88f00e0..3cbc5bf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1735,32 +1735,56 @@ test_util_strtok(void) { char buf[128]; char buf2[128]; + int i; char *cp1, *cp2; - strlcpy(buf, "Graved on the dark in gestures of descent", sizeof(buf)); - strlcpy(buf2, "they.seemed;their!own;most.perfect;monument", sizeof(buf2)); - /* -- "Year's End", Richard Wilbur */ - test_streq("Graved", tor_strtok_r_impl(buf, " ", &cp1)); - test_streq("they", tor_strtok_r_impl(buf2, ".!..;!", &cp2)); + for (i = 0; i < 3; i++) { + const char *pad1, *pad2; + switch (i) { + case 0: + pad1 = pad2 = ""; + break; + case 1: + pad1 = " "; + pad2 = "!"; + break; + case 2: + pad1 = " "; + pad2 = ";!"; + break; + } + tor_snprintf(buf, sizeof(buf), "%s", pad1); + tor_snprintf(buf2, sizeof(buf2), "%s", pad2); + test_assert(NULL == tor_strtok_r_impl(buf, " ", &cp1)); + test_assert(NULL == tor_strtok_r_impl(buf2, ".!..;!", &cp2)); + + tor_snprintf(buf, sizeof(buf), + "%sGraved on the dark in gestures of descent%s", pad1, pad1); + tor_snprintf(buf2, sizeof(buf2), + "%sthey.seemed;;their!.own;most.perfect;monument%s",pad2,pad2); + /* -- "Year's End", Richard Wilbur */ + + test_streq("Graved", tor_strtok_r_impl(buf, " ", &cp1)); + test_streq("they", tor_strtok_r_impl(buf2, ".!..;!", &cp2)); #define S1() tor_strtok_r_impl(NULL, " ", &cp1) #define S2() tor_strtok_r_impl(NULL, ".!..;!", &cp2) - test_streq("on", S1()); - test_streq("the", S1()); - test_streq("dark", S1()); - test_streq("seemed", S2()); - test_streq("their", S2()); - test_streq("own", S2()); - test_streq("in", S1()); - test_streq("gestures", S1()); - test_streq("of", S1()); - test_streq("most", S2()); - test_streq("perfect", S2()); - test_streq("descent", S1()); - test_streq("monument", S2()); - test_eq_ptr(NULL, S1()); - test_eq_ptr(NULL, S2()); + test_streq("on", S1()); + test_streq("the", S1()); + test_streq("dark", S1()); + test_streq("seemed", S2()); + test_streq("their", S2()); + test_streq("own", S2()); + test_streq("in", S1()); + test_streq("gestures", S1()); + test_streq("of", S1()); + test_streq("most", S2()); + test_streq("perfect", S2()); + test_streq("descent", S1()); + test_streq("monument", S2()); + test_eq_ptr(NULL, S1()); + test_eq_ptr(NULL, S2()); + } -#if 0 buf[0] = 0; test_eq_ptr(NULL, tor_strtok_r_impl(buf, " ", &cp1)); test_eq_ptr(NULL, tor_strtok_r_impl(buf, "!", &cp1)); @@ -1773,12 +1797,10 @@ test_util_strtok(void) test_eq_ptr(NULL, tor_strtok_r_impl(buf, " ", &cp1)); strlcpy(buf, " ", sizeof(buf)); test_eq_ptr(NULL, tor_strtok_r_impl(buf, " ", &cp1)); -#endif strlcpy(buf, "something ", sizeof(buf)); test_streq("something", tor_strtok_r_impl(buf, " ", &cp1)); - test_streq(" ", tor_strtok_r_impl(NULL, ";", &cp1)); - test_eq_ptr(NULL, tor_strtok_r_impl(NULL, " ", &cp1)); + test_eq_ptr(NULL, tor_strtok_r_impl(NULL, ";", &cp1)); done: ; }

1 0

[tor/master] Merge remote-tracking branch 'public/bug5091'
by nickm＠torproject.org 11 May '12

11 May '12

commit 84ddc4b6aad392dd9a735580caf6fb68e3694d42 Merge: 648db9a efb8a09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 11:45:40 2012 -0400 Merge remote-tracking branch 'public/bug5091' changes/bug5091 | 4 +++ src/common/compat.c | 30 +++++++++++++++++---- src/test/test_util.c | 70 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 74 insertions(+), 30 deletions(-)

1 0

[torbrowser/maint-2.2] bump openssl to 1.0.1c for new packages
by erinn＠torproject.org 11 May '12

11 May '12

commit 18dd7c3c790aaaa5aacc436ab7bd996163b2bcf1 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 10:50:54 2012 -0300 bump openssl to 1.0.1c for new packages --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 7920977..eda1b90 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 ZLIB_VER=1.2.6 -OPENSSL_VER=1.0.1b +OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17

1 0

[torbrowser/maint-2.3] bump openssl to 1.0.1c for new packages
by erinn＠torproject.org 11 May '12

11 May '12

commit 18dd7c3c790aaaa5aacc436ab7bd996163b2bcf1 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 10:50:54 2012 -0300 bump openssl to 1.0.1c for new packages --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 7920977..eda1b90 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 ZLIB_VER=1.2.6 -OPENSSL_VER=1.0.1b +OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 11 May '12

11 May '12

commit daad02b97c1c6b783919294aa41835ee9af65aac Merge: 7726228 18dd7c3 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 10:51:11 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] bump openssl to 1.0.1c for new packages
by erinn＠torproject.org 11 May '12

11 May '12

commit 18dd7c3c790aaaa5aacc436ab7bd996163b2bcf1 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 10:50:54 2012 -0300 bump openssl to 1.0.1c for new packages --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 7920977..eda1b90 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 ZLIB_VER=1.2.6 -OPENSSL_VER=1.0.1b +OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 11 May '12

11 May '12

commit daad02b97c1c6b783919294aa41835ee9af65aac Merge: 7726228 18dd7c3 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 10:51:11 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[metrics-tasks/master] Add simple parser for bridge descriptors in python to work on ticket 2866
by karsten＠torproject.org 11 May '12

11 May '12

commit 18509bdf00646fda601581795c6f7d7800976a50 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu May 10 19:41:09 2012 -0300 Add simple parser for bridge descriptors in python to work on ticket 2866 --- task-2866/parser.py | 313 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 313 insertions(+), 0 deletions(-) diff --git a/task-2866/parser.py b/task-2866/parser.py new file mode 100644 index 0000000..260120b --- /dev/null +++ b/task-2866/parser.py @@ -0,0 +1,313 @@ +import os +import datetime +import sys + +from math import floor + +UNALLOC_POOL = "unallocated" + +class Bridge(object): + def __init__(self, fp, pool = "", params = {}): + object.__init__(self) + self._fp = fp + self._pool = pool + self._params = params + self._from = None + self._to = None + self._usage_per_country = {} + self._usage_per_day = {} + + def pprint(self): + print self._fp, self._pool, self._params + + # <40 bytes fp> <pool> <key>=<val> ... + @staticmethod + def fromLine(line): + fp = line[:40] + pool = "" + params = {} + + rest = line[41:] + next_spc = rest.find(" ") + if next_spc == -1: + pool = rest + return Bridge(fp, pool) + + pool = rest[:next_spc] + rest = rest[next_spc+1:] + + key = val = "" + next_spc = rest.find(" ") + while next_spc != -1: + key, val = Bridge.parseKeyVal(rest[:next_spc]) + params[key] = val + rest = rest[next_spc+1:] + next_spc = rest.find(" ") + + return Bridge(fp, pool, params) + + @staticmethod + def parseKeyVal(line): + [key, val] = line.split("=") + return key, val + +class BridgePool(object): + def __init__(self, path, bridges, year, month, day, hour, minute, seconds): + object.__init__(self) + self._path = path + self._date = (year, month, day, hour, minute, seconds) + self._bridges = bridges + self.gatherBridges() + + def pprint(self): + print "%s/%s/%s :: %s:%s:%s" % self._date + for b in self._bridges: + b.pprint() + + def gatherBridges(self): + f = open(self._path, "r") + contents = f.read().split("\n")[1:] + for line in contents: + if len(line.strip()) == 0: + continue + if line[:40] in self._bridges.keys(): + self._bridges[line[:40]]._to = self._date + else: + b = Bridge.fromLine(line) + b._from = self._date + self._bridges[b._fp] = b + +def listHas(l, comp): + for e in l: + if e.startswith(comp): + return True + return False + +class BridgeUsageAnalyzer(object): + def __init__(self, fromPath = ".", bridges = {}): + object.__init__(self) + self._bridges = bridges + self._root = fromPath + self.gatherUsage() + + def gatherUsage(self): + print "Walking dirs to gather bridge usage (you might want to go do something else for a while)..." + for root, dirs, files in os.walk(self._root): + comps = root.split(os.sep) + # bridge-descriptors-<year>-<month>/fp[0]/fp[1]/fp + if not listHas(comps, "bridge-descriptors-"): + continue + if not listHas(comps, "extra-info"): + continue + print root + + for f in files: + f_value = os.path.join(root, f) + try: + bfp, ips, day = self.parseExtraInfo(f_value) + if not bfp in self._bridges.keys(): + #print "WARNING: %s is not in the bridge pool" % (f,) + continue + daily_usage = 0 + for c in ips.keys(): + if not c in self._bridges[bfp]._usage_per_country.keys(): + self._bridges[bfp]._usage_per_country[c] = 0 + self._bridges[bfp]._usage_per_country[c] += ips[c] + daily_usage += ips[c] + if not day in self._bridges[bfp]._usage_per_day.keys(): + self._bridges[bfp]._usage_per_day[day] = 0 + self._bridges[bfp]._usage_per_day[day] += daily_usage + except KeyboardInterrupt, e: + sys.exit(1) + except Exception, e: + print e + print "ERROR: Something was wrong while processing %s" % (f_value,) + + def parseExtraInfo(self, path): + contents = open(path, "r").read() + bfp = "" + ips = {} + day = "" + for l in contents.split("\n"): + if l.startswith("extra-info Unnamed"): + bfp = l.split(" ")[-1].lower() + continue + if l.startswith("published"): + day = l.split(" ")[1] + if l.startswith("bridge-ips"): + bridgeips = l.split(",")[1:] + try: + for ci in bridgeips: + parts = ci.split("=") + ips[parts[0]] = int(parts[1]) + except: + break + + return bfp, ips, day + + # Question: is there any correlation between the usage by country + # and the pool the bridge is from? + def analyzeUsage(self): + alloc_users = 0 + unalloc_users = 0 + + alloc_usage = {} + unalloc_usage = {} + for bfp in self._bridges.keys(): + acc = 0 + for c in self._bridges[bfp]._usage_per_country.keys(): + acc = self._bridges[bfp]._usage_per_country[c] + if self._bridges[bfp]._pool == UNALLOC_POOL: + unalloc_users += acc + if not c in unalloc_usage.keys(): + unalloc_usage[c] = 0 + unalloc_usage[c] += acc + else: + alloc_users += acc + if not c in alloc_usage.keys(): + alloc_usage[c] = 0 + alloc_usage[c] += acc + + print "Total allocated pool users: %d" % (alloc_users,) + print "Total unallocated pool users: %d" % (unalloc_users,) + + alloc_items = alloc_usage.items() + alloc_sorted_items = sorted(alloc_items, key=lambda use: use[1]) + print "Country usage for allocated pool:" + for country, count in alloc_sorted_items: + print " %s = %d" % (country, count) + + unalloc_items = unalloc_usage.items() + unalloc_sorted_items = sorted(unalloc_items, key=lambda use: use[1]) + print "Country usage for unallocated pool:" + for country, count in unalloc_sorted_items: + print " %s = %d" % (country, count) + + total_avg_unalloc = [] + total_avg_alloc = [] + for bfp in self._bridges.keys(): + avg = 0.0 + for day in self._bridges[bfp]._usage_per_day.keys(): + avg += self._bridges[bfp]._usage_per_day[day] + if avg == 0.0: + continue + avg = float(avg)/len(self._bridges[bfp]._usage_per_day.keys()) + if self._bridges[bfp]._pool == UNALLOC_POOL: + total_avg_unalloc.append(avg) + else: + total_avg_alloc.append(avg) + #print "Average for %s: %d" % (bfp, avg) + total_avg_unalloc.sort() + total_avg_alloc.sort() + + print "Unallocated pool:" + print " Average clients per day: %d" % (float(sum(total_avg_unalloc))/len(total_avg_unalloc),) + print " Median: %d" % (total_avg_unalloc[int(round(len(total_avg_unalloc)/2.0))],) + print " 75th percentile: %d" % (total_avg_unalloc[int(round(len(total_avg_unalloc)*0.75))],) + print " 90th percentile: %d" % (total_avg_unalloc[int(round(len(total_avg_unalloc)*0.9))],) + + print "Allocated pool:" + print " Average clients per day: %d" % (float(sum(total_avg_alloc))/len(total_avg_alloc),) + print " Median: %d" % (total_avg_alloc[int(round(len(total_avg_alloc)/2.0))],) + print " 75th percentile: %d" % (total_avg_alloc[int(round(len(total_avg_alloc)*0.75))],) + print " 90th percentile: %d" % (total_avg_alloc[int(round(len(total_avg_alloc)*0.9))],) + +class BridgePoolAnalyzer(object): + year = 0 + month = 1 + day = 2 + hour = 3 + minute = 4 + seconds = 5 + + def __init__(self, fromPath = "."): + object.__init__(self) + self._root = fromPath + self._pools = [] + self._bridges = {} + self.gatherBridgePools() + + def pprint(self): + for bp in self._pools: + bp.pprint() + + def gatherBridgePools(self): + print "Walking dirs to gather bridge pools (you might want to go do something else for a while)..." + for root, dirs, files in os.walk(self._root): + comps = root.split(os.sep) + if not listHas(comps,"bridge-pool-assignments"): + continue + print root + + for f in files: + f_value = os.path.join(root, f) + date = f.split("-") + try: + self._pools.append(BridgePool(f_value, self._bridges, + date[self.year], date[self.month], date[self.day], + date[self.hour], date[self.minute], date[self.seconds])) + except KeyboardInterrupt, e: + sys.exit(1) + except Exception, e: + print e + print "ERROR: Something was wrong while processing %s" % (f_value,) + + # Question: how much do bridges last when they are unassigned? + def bridgeAvailability(self): + print "Analyzing the data..." + availability_unalloc = {} + availability_else = {} + + for bfp in self._bridges.keys(): + b = self._bridges[bfp] + if b._to is None: + b._to = self._pools[-1]._date + if b._pool == UNALLOC_POOL: + availability_unalloc[b._fp] = (datetime.datetime(int(b._to[0]), int(b._to[1]), int(b._to[2]), + int(b._to[3]), int(b._to[4]), int(b._to[5])) - + datetime.datetime(int(b._from[0]), int(b._from[1]), int(b._from[2]), + int(b._from[3]), int(b._from[4]), int(b._from[5]))).total_seconds() / (60.0 * 60.0 * 24.0) + else: + availability_else[b._fp] = (datetime.datetime(int(b._to[0]), int(b._to[1]), int(b._to[2]), + int(b._to[3]), int(b._to[4]), int(b._to[5])) - + datetime.datetime(int(b._from[0]), int(b._from[1]), int(b._from[2]), + int(b._from[3]), int(b._from[4]), int(b._from[5]))).total_seconds() / (60.0 * 60.0 * 24.0) + + print "Allocated bridges:" + doall(availability_else) + + print "Unallocated bridges:" + doall(availability_unalloc) + +def calc_average(array): + avg = 0.0 + for k in array.keys(): + avg += float(array[k]) + avg /= len(array.keys()) + return avg + +def calc_median(values): + return values[int(floor(len(values)/2.0))] + +def calc_percentile(values, perc): + pos = int(round(perc/100.0 * float(len(values)))) + return values[pos] + +def doall(array): + print " Average availability:", calc_average(array) + values = array.values() + values.sort() + print " Median availability:", calc_median(values) + print " 75th percentile availability:", calc_percentile(values, 75) + print " 90th percentile availability:", calc_percentile(values, 90) + +if __name__ == "__main__": + path = "." + if len(sys.argv) > 1: + path = sys.argv[1] + bpa = BridgePoolAnalyzer(path) + #bpa.pprint() + bpa.bridgeAvailability() + + bua = BridgeUsageAnalyzer(path, bpa._bridges) + bua.analyzeUsage()

1 0