June 2014 - tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 15 Jun '14

15 Jun '14

commit d71f0adbba824cf6ea2db7903bafe901ed3a6075 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 15 17:15:04 2014 +0000 Update translations for gettor --- fi/gettor.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fi/gettor.po b/fi/gettor.po index 1c7c346..e5c29be 100644 --- a/fi/gettor.po +++ b/fi/gettor.po @@ -5,7 +5,7 @@ # Translators: # morso <debris(a)riseup.net>, 2013 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 -# SamiPerkele, 2014 +# Sami Korkalainen, 2014 # tonttula, 2013 # Finland355 <ville.ehrukainen2(a)gmail.com>, 2014 msgid "" @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-04-22 12:00+0000\n" +"PO-Revision-Date: 2014-06-15 17:12+0000\n" "Last-Translator: Finland355 <ville.ehrukainen2(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" @@ -93,7 +93,7 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "" +msgstr "Jotta saat torin version käännettyä omalla kielellesi, tai kielen jonka haluat lähetä se kieli jonka haluat osoitteeseen: gettor+fa(a)torproject.org" #: lib/gettor/i18n.py:72 msgid ""

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 15 Jun '14

15 Jun '14

commit f876701323af3c233d8246c2c4d289d4e8f3e709 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 15 06:45:08 2014 +0000 Update translations for gettor_completed --- fa/gettor.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index ebda302..59af54b 100644 --- a/fa/gettor.po +++ b/fa/gettor.po @@ -6,18 +6,19 @@ # signal89 <ali.faraji90(a)gmail.com>, 2014 # behravan <behravanhamed(a)gmail.com>, 2011 # zmix <check_people_status(a)yahoo.com>, 2013 -# desmati <desmati(a)gmail.com>, 2014 +# Mohammad Hossein <desmati(a)gmail.com>, 2014 # zendegi <hamahangi(a)posteo.eu>, 2013 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # martin luther king <sabztunnel(a)gmail.com>, 2011, 2012 +# M. Heydar Elahi <m.heydar.elahi(a)gmail.com>, 2014 # Setareh <setareh.salehee(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-05-17 18:12+0000\n" -"Last-Translator: Setareh <setareh.salehee(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-15 06:30+0000\n" +"Last-Translator: M. Heydar Elahi <m.heydar.elahi(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,7 +112,7 @@ msgstr "فهرست محل‌هایی که پشتیبانی می‌شوند:" #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" -msgstr "فهرستی از زبان‌های موجود:" +msgstr "فهرست تمام زبان های موجود :" #: lib/gettor/i18n.py:80 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 15 Jun '14

15 Jun '14

commit 274202447404eb9fae063e5c25f18038a98df06d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 15 06:45:05 2014 +0000 Update translations for gettor --- fa/gettor.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index ebda302..59af54b 100644 --- a/fa/gettor.po +++ b/fa/gettor.po @@ -6,18 +6,19 @@ # signal89 <ali.faraji90(a)gmail.com>, 2014 # behravan <behravanhamed(a)gmail.com>, 2011 # zmix <check_people_status(a)yahoo.com>, 2013 -# desmati <desmati(a)gmail.com>, 2014 +# Mohammad Hossein <desmati(a)gmail.com>, 2014 # zendegi <hamahangi(a)posteo.eu>, 2013 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # martin luther king <sabztunnel(a)gmail.com>, 2011, 2012 +# M. Heydar Elahi <m.heydar.elahi(a)gmail.com>, 2014 # Setareh <setareh.salehee(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-05-17 18:12+0000\n" -"Last-Translator: Setareh <setareh.salehee(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-15 06:30+0000\n" +"Last-Translator: M. Heydar Elahi <m.heydar.elahi(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,7 +112,7 @@ msgstr "فهرست محل‌هایی که پشتیبانی می‌شوند:" #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" -msgstr "فهرستی از زبان‌های موجود:" +msgstr "فهرست تمام زبان های موجود :" #: lib/gettor/i18n.py:80 msgid ""

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 15 Jun '14

15 Jun '14

commit 328e5d1336fe5e0bfd393cc2ee8d9233c5767fb8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 15 05:15:13 2014 +0000 Update translations for torcheck_completed --- fa/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/torcheck.po b/fa/torcheck.po index c3084ca..049cd2d 100644 --- a/fa/torcheck.po +++ b/fa/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-15 04:43+0000\n" +"PO-Revision-Date: 2014-06-15 04:50+0000\n" "Last-Translator: M. Heydar Elahi <m.heydar.elahi(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 15 Jun '14

15 Jun '14

commit 904bed9a69c66788998bffb4afb5eeb62e9bdd5b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 15 05:15:10 2014 +0000 Update translations for torcheck --- fa/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/torcheck.po b/fa/torcheck.po index c3084ca..049cd2d 100644 --- a/fa/torcheck.po +++ b/fa/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-06-15 04:43+0000\n" +"PO-Revision-Date: 2014-06-15 04:50+0000\n" "Last-Translator: M. Heydar Elahi <m.heydar.elahi(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 15 Jun '14

15 Jun '14

commit a4da1775cbd58a5155177dd9de63f65c16fbee2b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 15 04:45:13 2014 +0000 Update translations for torcheck_completed --- fa/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fa/torcheck.po b/fa/torcheck.po index a4c3d49..c3084ca 100644 --- a/fa/torcheck.po +++ b/fa/torcheck.po @@ -2,8 +2,9 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# Ardeshir, 2012 -# desmati <desmati(a)gmail.com>, 2014 +# ardeshir, 2012 +# Mohammad Hossein <desmati(a)gmail.com>, 2014 +# M. Heydar Elahi <m.heydar.elahi(a)gmail.com>, 2014 # mohammad.s.n, 2013 # politicmaniac <politicmaniac(a)gmail.com>, 2014 # Reza Pakdel <pakdelreza(a)gmail.com>, 2011 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-12 03:30+0000\n" -"Last-Translator: politicmaniac <politicmaniac(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-15 04:43+0000\n" +"Last-Translator: M. Heydar Elahi <m.heydar.elahi(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +51,7 @@ msgid "" msgstr "اگر قصد دارید از یک کلاینت تور استفاده کنید، لطفاً به <a href=\"https://www.torproject.org/\">وبسایت تور</a> و مخصوصاً به <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">راهنمای تنظیم و راه اندازی کلاینت تور</a> مراجعه کنید." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "متاسفانه درخواست شما ناموفق بود و يا پاسخی نامربوط دريافت شد." +msgstr "متاسفانه درخواست شما ناموفق بود و يا پاسخی غیر منتظره دريافت شد." msgid "" "A temporary service outage prevents us from determining if your source IP "

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 15 Jun '14

15 Jun '14

commit a08605c9bd1d2191bad2d2e0abd24ca870e04105 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jun 15 04:45:09 2014 +0000 Update translations for torcheck --- fa/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fa/torcheck.po b/fa/torcheck.po index a4c3d49..c3084ca 100644 --- a/fa/torcheck.po +++ b/fa/torcheck.po @@ -2,8 +2,9 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# Ardeshir, 2012 -# desmati <desmati(a)gmail.com>, 2014 +# ardeshir, 2012 +# Mohammad Hossein <desmati(a)gmail.com>, 2014 +# M. Heydar Elahi <m.heydar.elahi(a)gmail.com>, 2014 # mohammad.s.n, 2013 # politicmaniac <politicmaniac(a)gmail.com>, 2014 # Reza Pakdel <pakdelreza(a)gmail.com>, 2011 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-12 03:30+0000\n" -"Last-Translator: politicmaniac <politicmaniac(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-15 04:43+0000\n" +"Last-Translator: M. Heydar Elahi <m.heydar.elahi(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +51,7 @@ msgid "" msgstr "اگر قصد دارید از یک کلاینت تور استفاده کنید، لطفاً به <a href=\"https://www.torproject.org/\">وبسایت تور</a> و مخصوصاً به <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">راهنمای تنظیم و راه اندازی کلاینت تور</a> مراجعه کنید." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "متاسفانه درخواست شما ناموفق بود و يا پاسخی نامربوط دريافت شد." +msgstr "متاسفانه درخواست شما ناموفق بود و يا پاسخی غیر منتظره دريافت شد." msgid "" "A temporary service outage prevents us from determining if your source IP "

1 0

[tor/master] New testing-only tor_sleep_msec function
by nickm＠torproject.org 14 Jun '14

14 Jun '14

commit e2e588175eac4ebe8fb47c0540954d0f78525cce Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 12:48:46 2014 -0400 New testing-only tor_sleep_msec function In the unit tests I want to loop with a delay, but I want less than a 1 second delay. This, sadly, requires compatibility code. --- configure.ac | 2 ++ src/common/compat.c | 26 ++++++++++++++++++++++++++ src/common/compat.h | 4 ++++ 3 files changed, 32 insertions(+) diff --git a/configure.ac b/configure.ac index c0c8187..c662a9f 100644 --- a/configure.ac +++ b/configure.ac @@ -355,6 +355,7 @@ AC_CHECK_FUNCS( sysconf \ sysctl \ uname \ + usleep \ vasprintf \ _vscprintf ) @@ -885,6 +886,7 @@ AC_CHECK_HEADERS( sys/param.h \ sys/prctl.h \ sys/resource.h \ + sys/select.h \ sys/socket.h \ sys/sysctl.h \ sys/syslimits.h \ diff --git a/src/common/compat.c b/src/common/compat.c index 1ba264a..1c460b6 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -114,6 +114,12 @@ /* Only use the linux prctl; the IRIX prctl is totally different */ #include <sys/prctl.h> #endif +#ifdef TOR_UNIT_TESTS +#if !defined(HAVE_USLEEP) && defined(HAVE_SYS_SELECT_H) +/* as fallback implementation for tor_sleep_msec */ +#include <sys/select.h> +#endif +#endif #include "torlog.h" #include "util.h" @@ -3450,3 +3456,23 @@ get_total_system_memory(size_t *mem_out) return -1; } +#ifdef TOR_UNIT_TESTS +/** Delay for msec milliseconds. Only used in tests. */ +void +tor_sleep_msec(int msec) +{ +#ifdef _WIN32 + Sleep(msec); +#elif defined(HAVE_USLEEP) + sleep(msec / 1000); + /* Some usleep()s hate sleeping more than 1 sec */ + usleep((msec % 1000) * 1000); +#elif defined(HAVE_SYS_SELECT_H) + struct timeval tv = { msec / 1000, (msec % 1000) * 1000}; + select(0, NULL, NULL, NULL, &tv); +#else + sleep(CEIL_DIV(msec, 1000)); +#endif +} +#endif + diff --git a/src/common/compat.h b/src/common/compat.h index 314b1aa..d723448 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -744,6 +744,10 @@ char *format_win32_error(DWORD err); #endif +#ifdef TOR_UNIT_TESTS +void tor_sleep_msec(int msec); +#endif + #ifdef COMPAT_PRIVATE #if !defined(HAVE_SOCKETPAIR) || defined(_WIN32) || defined(TOR_UNIT_TESTS) #define NEED_ERSATZ_SOCKETPAIR

1 0

[tor/master] New waitpid-handler functions to run callbacks when a child exits.
by nickm＠torproject.org 14 Jun '14

14 Jun '14

commit 4ed03965a5a412bf58540e678f48f6c331ad30d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 9 13:45:27 2014 -0400 New waitpid-handler functions to run callbacks when a child exits. Also, move 'procmon' into libor_event library, since it uses libevent. --- src/common/include.am | 9 ++- src/common/procmon.c | 1 + src/common/util_process.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ src/common/util_process.h | 25 ++++++++ src/or/main.c | 4 +- src/or/or.h | 3 - 6 files changed, 191 insertions(+), 8 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 7b2465c..c9dcedd 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -57,9 +57,9 @@ LIBOR_A_SOURCES = \ src/common/log.c \ src/common/memarea.c \ src/common/mempool.c \ - src/common/procmon.c \ src/common/util.c \ src/common/util_codedigest.c \ + src/common/util_process.c \ src/common/sandbox.c \ src/ext/csiphash.c \ $(libor_extra_source) @@ -72,7 +72,9 @@ LIBOR_CRYPTO_A_SOURCES = \ src/common/tortls.c \ $(libcrypto_extra_source) -LIBOR_EVENT_A_SOURCES = src/common/compat_libevent.c +LIBOR_EVENT_A_SOURCES = \ + src/common/compat_libevent.c \ + src/common/procmon.c src_common_libor_a_SOURCES = $(LIBOR_A_SOURCES) src_common_libor_crypto_a_SOURCES = $(LIBOR_CRYPTO_A_SOURCES) @@ -111,7 +113,8 @@ COMMONHEADERS = \ src/common/torint.h \ src/common/torlog.h \ src/common/tortls.h \ - src/common/util.h + src/common/util.h \ + src/common/util_process.h noinst_HEADERS+= $(COMMONHEADERS) diff --git a/src/common/procmon.c b/src/common/procmon.c index 0a49689..7c9b7c3 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -162,6 +162,7 @@ tor_validate_process_specifier(const char *process_spec, return parse_process_specifier(process_spec, &ppspec, msg); } +/* XXXX we should use periodic_timer_new() for this stuff */ #ifdef HAVE_EVENT2_EVENT_H #define PERIODIC_TIMER_FLAGS EV_PERSIST #else diff --git a/src/common/util_process.c b/src/common/util_process.c new file mode 100644 index 0000000..8ccf7f3 --- /dev/null +++ b/src/common/util_process.c @@ -0,0 +1,157 @@ +/* Copyright (c) 2003-2004, Roger Dingledine + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file util_process.c + * \brief utility functions for launching processes and checking their + * status. These functions are kept separately from procmon so that they + * won't require linking against libevent. + **/ + +#include "orconfig.h" + +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif + +#include "compat.h" +#include "util.h" +#include "torlog.h" +#include "util_process.h" +#include "ht.h" + +/* ================================================== */ +/* Convenience structures for handlers for waitpid(). + * + * The tor_process_monitor*() code above doesn't use them, since it is for + * monitoring a non-child process. + */ + +#ifndef _WIN32 + +/** Mapping from a PID to a userfn/userdata pair. */ +struct waitpid_callback_t { + HT_ENTRY(waitpid_callback_t) node; + pid_t pid; + + void (*userfn)(int, void *userdata); + void *userdata; + + unsigned running; +}; + +static INLINE unsigned int +process_map_entry_hash_(const waitpid_callback_t *ent) +{ + return (unsigned) ent->pid; +} + +static INLINE unsigned int +process_map_entries_eq_(const waitpid_callback_t *a, const waitpid_callback_t *b) +{ + return a->pid == b->pid; +} + +static HT_HEAD(process_map, waitpid_callback_t) process_map = HT_INITIALIZER(); + +HT_PROTOTYPE(process_map, waitpid_callback_t, node, process_map_entry_hash_, + process_map_entries_eq_); +HT_GENERATE(process_map, waitpid_callback_t, node, process_map_entry_hash_, + process_map_entries_eq_, 0.6, malloc, realloc, free); + +/** + * Begin monitoring the child pid pid to see if we get a SIGCHLD for + * it. If we eventually do, call fn, passing it the exit status (as + * yielded by waitpid) and the pointer arg. + * + * To cancel this, or clean up after it has triggered, call + * clear_waitpid_callback(). + */ +waitpid_callback_t * +set_waitpid_callback(pid_t pid, void (*fn)(int, void *), void *arg) +{ + waitpid_callback_t *old_ent; + waitpid_callback_t *ent = tor_malloc_zero(sizeof(waitpid_callback_t)); + ent->pid = pid; + ent->userfn = fn; + ent->userdata = arg; + ent->running = 1; + + old_ent = HT_REPLACE(process_map, &process_map, ent); + if (old_ent) { + log_warn(LD_BUG, "Replaced a waitpid monitor on pid %u. That should be " + "impossible.", (unsigned) pid); + old_ent->running = 0; + } + + return ent; +} + +/** + * Cancel a waitpid_callback_t, or clean up after one has triggered. Releases + * all storage held by ent. + */ +void +clear_waitpid_callback(waitpid_callback_t *ent) +{ + waitpid_callback_t *old_ent; + if (ent == NULL) + return; + + if (ent->running) { + old_ent = HT_REMOVE(process_map, &process_map, ent); + if (old_ent != ent) { + log_warn(LD_BUG, "Couldn't remove waitpid monitor for pid %u.", + (unsigned) ent->pid); + return; + } + } + + tor_free(ent); +} + +/** Helper: find the callack for pid; if there is one, run it, + * reporting the exit status as status. */ +static void +notify_waitpid_callback_by_pid(pid_t pid, int status) +{ + waitpid_callback_t search, *ent; + + search.pid = pid; + ent = HT_REMOVE(process_map, &process_map, &search); + if (!ent || !ent->running) { + log_info(LD_GENERAL, "Child process %u has exited; no callback was " + "registered", (unsigned)pid); + return; + } + + log_info(LD_GENERAL, "Child process %u has exited; running callback.", + (unsigned)pid); + + ent->running = 0; + ent->userfn(status, ent->userdata); +} + +/** Use waitpid() to wait for all children that have exited, and invoke any + * callbacks registered for them. */ +void +notify_pending_waitpid_callbacks(void) +{ + /* I was going to call this function reap_zombie_children(), but + * that makes it sound way more exciting than it really is. */ + pid_t child; + int status = 0; + + while ((child = waitpid(-1, &status, WNOHANG)) > 0) { + notify_waitpid_callback_by_pid(child, status); + status = 0; /* should be needless */ + } +} + +#endif + diff --git a/src/common/util_process.h b/src/common/util_process.h new file mode 100644 index 0000000..877702c --- /dev/null +++ b/src/common/util_process.h @@ -0,0 +1,25 @@ +/* Copyright (c) 2011-2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file util_process.h + * \brief Headers for util_process.c + **/ + +#ifndef TOR_UTIL_PROCESS_H +#define TOR_UTIL_PROCESS_H + +#ifndef _WIN32 +/** A callback structure waiting for us to get a SIGCHLD informing us that a + * PID has been closed. Created by set_waitpid_callback. Cancelled or cleaned- + * up from clear_waitpid_callback(). Do not access outside of the main thread; + * do not access from inside a signal handler. */ +typedef struct waitpid_callback_t waitpid_callback_t; + +waitpid_callback_t *set_waitpid_callback(pid_t pid, + void (*fn)(int, void *), void *arg); +void clear_waitpid_callback(waitpid_callback_t *ent); +void notify_pending_waitpid_callbacks(void); +#endif + +#endif diff --git a/src/or/main.c b/src/or/main.c index 6713d80..2ca7174 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -54,6 +54,7 @@ #include "routerparse.h" #include "statefile.h" #include "status.h" +#include "util_process.h" #include "ext_orport.h" #ifdef USE_DMALLOC #include <dmalloc.h> @@ -2097,8 +2098,7 @@ process_signal(uintptr_t sig) break; #ifdef SIGCHLD case SIGCHLD: - while (waitpid(-1,NULL,WNOHANG) > 0) ; /* keep reaping until no more - zombies */ + notify_pending_waitpid_callbacks(); break; #endif case SIGNEWNYM: { diff --git a/src/or/or.h b/src/or/or.h index aeaeb8e..9586034 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -42,9 +42,6 @@ #include <sys/param.h> /* FreeBSD needs this to know what version it is */ #endif #include "torint.h" -#ifdef HAVE_SYS_WAIT_H -#include <sys/wait.h> -#endif #ifdef HAVE_SYS_FCNTL_H #include <sys/fcntl.h> #endif

1 0

[tor/master] More unit tests for process spawning
by nickm＠torproject.org 14 Jun '14

14 Jun '14

commit e3833193af11dc4252e90565c3919889cc4130b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 12:50:00 2014 -0400 More unit tests for process spawning Try killing a running process; try noticing that a process has exited without checking its output; verify that waitpid_cb (when present) is set to NULL when you would expect it to be. --- src/test/test-child.c | 40 +++++++++++----- src/test/test_util.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 146 insertions(+), 18 deletions(-) diff --git a/src/test/test-child.c b/src/test/test-child.c index ef10fbb..756782e 100644 --- a/src/test/test-child.c +++ b/src/test/test-child.c @@ -9,6 +9,13 @@ #else #include <unistd.h> #endif +#include <string.h> + +#ifdef _WIN32 +#define SLEEP(sec) Sleep((sec)*1000) +#else +#define SLEEP(sec) sleep(sec) +#endif /** Trivial test program which prints out its command line arguments so we can * check if tor_spawn_background() works */ @@ -16,27 +23,38 @@ int main(int argc, char **argv) { int i; + int delay = 1; + int fast = 0; + + if (argc > 1) { + if (!strcmp(argv[1], "--hang")) { + delay = 60; + } else if (!strcmp(argv[1], "--fast")) { + fast = 1; + delay = 0; + } + } fprintf(stdout, "OUT\n"); fprintf(stderr, "ERR\n"); for (i = 1; i < argc; i++) fprintf(stdout, "%s\n", argv[i]); - fprintf(stdout, "SLEEPING\n"); + if (!fast) + fprintf(stdout, "SLEEPING\n"); /* We need to flush stdout so that test_util_spawn_background_partial_read() succeed. Otherwise ReadFile() will get the entire output in one */ // XXX: Can we make stdio flush on newline? fflush(stdout); -#ifdef _WIN32 - Sleep(1000); -#else - sleep(1); -#endif + if (!fast) + SLEEP(1); fprintf(stdout, "DONE\n"); -#ifdef _WIN32 - Sleep(1000); -#else - sleep(1); -#endif + fflush(stdout); + if (fast) + return 0; + + while (--delay) { + SLEEP(1); + } return 0; } diff --git a/src/test/test_util.c b/src/test/test_util.c index 6d6b6db..029e88e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -14,6 +14,7 @@ #include "test.h" #include "mempool.h" #include "memarea.h" +#include "util_process.h" #ifdef _WIN32 #include <tchar.h> @@ -2529,6 +2530,10 @@ test_util_fgets_eagain(void *ptr) } #endif +#ifdef _WIN32 +#define notify_pending_waitpid_callbacks() STMT_NIL +#endif + /** Helper function for testing tor_spawn_background */ static void run_util_spawn_background(const char *argv[], const char *expected_out, @@ -2548,19 +2553,28 @@ run_util_spawn_background(const char *argv[], const char *expected_out, status = tor_spawn_background(argv[0], argv, NULL, &process_handle); #endif + notify_pending_waitpid_callbacks(); + test_eq(expected_status, status); - if (status == PROCESS_STATUS_ERROR) + if (status == PROCESS_STATUS_ERROR) { + tt_ptr_op(process_handle, ==, NULL); return; + } test_assert(process_handle != NULL); test_eq(expected_status, process_handle->status); +#ifndef _WIN32 + notify_pending_waitpid_callbacks(); + tt_ptr_op(process_handle->waitpid_cb, !=, NULL); +#endif + #ifdef _WIN32 test_assert(process_handle->stdout_pipe != INVALID_HANDLE_VALUE); test_assert(process_handle->stderr_pipe != INVALID_HANDLE_VALUE); #else - test_assert(process_handle->stdout_pipe > 0); - test_assert(process_handle->stderr_pipe > 0); + test_assert(process_handle->stdout_pipe >= 0); + test_assert(process_handle->stderr_pipe >= 0); #endif /* Check stdout */ @@ -2571,12 +2585,19 @@ run_util_spawn_background(const char *argv[], const char *expected_out, test_eq(strlen(expected_out), pos); test_streq(expected_out, stdout_buf); + notify_pending_waitpid_callbacks(); + /* Check it terminated correctly */ retval = tor_get_exit_code(process_handle, 1, &exit_code); test_eq(PROCESS_EXIT_EXITED, retval); test_eq(expected_exit, exit_code); // TODO: Make test-child exit with something other than 0 +#ifndef _WIN32 + notify_pending_waitpid_callbacks(); + tt_ptr_op(process_handle->waitpid_cb, ==, NULL); +#endif + /* Check stderr */ pos = tor_read_all_from_process_stderr(process_handle, stderr_buf, sizeof(stderr_buf) - 1); @@ -2585,6 +2606,8 @@ run_util_spawn_background(const char *argv[], const char *expected_out, test_streq(expected_err, stderr_buf); test_eq(strlen(expected_err), pos); + notify_pending_waitpid_callbacks(); + done: if (process_handle) tor_process_handle_destroy(process_handle, 1); @@ -2607,7 +2630,7 @@ test_util_spawn_background_ok(void *ptr) (void)ptr; run_util_spawn_background(argv, expected_out, expected_err, 0, - PROCESS_STATUS_RUNNING); + PROCESS_STATUS_RUNNING); } /** Check that failing to find the executable works as expected */ @@ -2637,13 +2660,13 @@ test_util_spawn_background_fail(void *ptr) "ERR: Failed to spawn background process - code %s\n", code); run_util_spawn_background(argv, expected_out, expected_err, 255, - expected_status); + expected_status); } /** Test that reading from a handle returns a partial read rather than * blocking */ static void -test_util_spawn_background_partial_read(void *ptr) +test_util_spawn_background_partial_read_impl(int exit_early) { const int expected_exit = 0; const int expected_status = PROCESS_STATUS_RUNNING; @@ -2668,7 +2691,16 @@ test_util_spawn_background_partial_read(void *ptr) int eof = 0; #endif int expected_out_ctr; - (void)ptr; + + + if (exit_early) { + argv[1] = "--hang"; +#ifdef _WIN32 + expected_out[0] = "OUT\r\n--hang\r\nSLEEPING\r\n"; +#else + expected_out[0] = "OUT\n--hang\nSLEEPING\n"; +#endif + } /* Start the program */ #ifdef _WIN32 @@ -2704,6 +2736,12 @@ test_util_spawn_background_partial_read(void *ptr) expected_out_ctr++; } + if (exit_early) { + tor_process_handle_destroy(process_handle, 1); + process_handle = NULL; + goto done; + } + /* The process should have exited without writing more */ #ifdef _WIN32 pos = tor_read_all_handle(process_handle->stdout_pipe, stdout_buf, @@ -2741,6 +2779,76 @@ test_util_spawn_background_partial_read(void *ptr) tor_process_handle_destroy(process_handle, 1); } +static void +test_util_spawn_background_partial_read(void *arg) +{ + (void)arg; + test_util_spawn_background_partial_read_impl(0); +} + +static void +test_util_spawn_background_exit_early(void *arg) +{ + (void)arg; + test_util_spawn_background_partial_read_impl(1); +} + +static void +test_util_spawn_background_waitpid_notify(void *arg) +{ + int retval, exit_code; + process_handle_t *process_handle=NULL; + int status; + int ms_timer; + +#ifdef _WIN32 + const char *argv[] = {"test-child.exe", "--fast", NULL}; +#else + const char *argv[] = {BUILDDIR "/src/test/test-child", "--fast", NULL}; +#endif + + (void) arg; + +#ifdef _WIN32 + status = tor_spawn_background(NULL, argv, NULL, &process_handle); +#else + status = tor_spawn_background(argv[0], argv, NULL, &process_handle); +#endif + + tt_int_op(status, ==, PROCESS_STATUS_RUNNING); + tt_ptr_op(process_handle, !=, NULL); + + /* We're not going to look at the stdout/stderr output this time. Instead, + * we're testing whether notify_pending_waitpid_calbacks() can report the + * process exit (on unix) and/or whether tor_get_exit_code() can notice it + * (on windows) */ + +#ifndef _WIN32 + ms_timer = 30*1000; + tt_ptr_op(process_handle->waitpid_cb, !=, NULL); + while (process_handle->waitpid_cb && ms_timer > 0) { + tor_sleep_msec(100); + ms_timer -= 100; + notify_pending_waitpid_callbacks(); + } + tt_int_op(ms_timer, >, 0); + tt_ptr_op(process_handle->waitpid_cb, ==, NULL); +#endif + + ms_timer = 30*1000; + while (((retval = tor_get_exit_code(process_handle, 0, &exit_code)) + == PROCESS_EXIT_RUNNING) && ms_timer > 0) { + tor_sleep_msec(100); + ms_timer -= 100; + } + tt_int_op(ms_timer, >, 0); + + tt_int_op(retval, ==, PROCESS_EXIT_EXITED); + + done: + tor_process_handle_destroy(process_handle, 1); +} + /** * Test for format_hex_number_sigsafe() */ @@ -3682,6 +3790,8 @@ struct testcase_t util_tests[] = { UTIL_TEST(spawn_background_ok, 0), UTIL_TEST(spawn_background_fail, 0), UTIL_TEST(spawn_background_partial_read, 0), + UTIL_TEST(spawn_background_exit_early, 0), + UTIL_TEST(spawn_background_waitpid_notify, 0), UTIL_TEST(format_hex_number, 0), UTIL_TEST(format_dec_number, 0), UTIL_TEST(join_win_cmdline, 0),

1 0