[tor-commits] [tor/master] Merge branch 'better_workqueue_v3_squashed'

[nickm@xxxxxxxxxxxxxx]

commit 23fc1691b6dff4b0a3ad173809915901eb47fcab
Merge: f0415c1 84f5cb7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 21 14:47:16 2015 -0500

    Merge branch 'better_workqueue_v3_squashed'

 .gitignore                     |    2 +
 changes/better_workqueues      |   10 +
 configure.ac                   |   10 +-
 src/common/compat.c            |  395 ---------------------
 src/common/compat.h            |   57 +--
 src/common/compat_pthreads.c   |  285 +++++++++++++++
 src/common/compat_threads.c    |  303 ++++++++++++++++
 src/common/compat_threads.h    |  115 +++++++
 src/common/compat_winthreads.c |  196 +++++++++++
 src/common/include.am          |   15 +-
 src/common/workqueue.c         |  490 ++++++++++++++++++++++++++
 src/common/workqueue.h         |   48 +++
 src/or/circuitlist.c           |   17 +-
 src/or/command.c               |    2 +-
 src/or/config.c                |    2 +-
 src/or/connection.c            |   24 +-
 src/or/cpuworker.c             |  746 ++++++++++++++++------------------------
 src/or/cpuworker.h             |   10 +-
 src/or/main.c                  |    6 +-
 src/or/onion.c                 |   19 +-
 src/or/onion.h                 |    4 +-
 src/or/or.h                    |   23 +-
 src/test/include.am            |   17 +-
 src/test/test.c                |   19 +
 src/test/test.h                |    2 +
 src/test/test_crypto.c         |   36 +-
 src/test/test_threads.c        |  316 +++++++++++++++++
 src/test/test_util.c           |  158 +--------
 src/test/test_workqueue.c      |  409 ++++++++++++++++++++++
 29 files changed, 2591 insertions(+), 1145 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits