@@ -138,7 +138,6 @@ openvpn_SOURCES = \

 	ssl.c ssl.h \

 	status.c status.h \

 	syshead.h \

-	thread.c thread.h \

 	tun.c tun.h \

 	win32.h win32.c \

 	cryptoapi.h cryptoapi.c

@@ -129,227 +129,3 @@ AC_DEFUN([TYPE_SOCKLEN_T],

       [#include <sys/types.h>

 #include <sys/socket.h>])

 ])

-

-dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])

-dnl

-dnl This macro figures out how to build C programs using POSIX

-dnl threads.  It sets the PTHREAD_LIBS output variable to the threads

-dnl library and linker flags, and the PTHREAD_CFLAGS output variable

-dnl to any special C compiler flags that are needed.  (The user can also

-dnl force certain compiler flags/libs to be tested by setting these

-dnl environment variables.)

-dnl

-dnl Also sets PTHREAD_CC to any special C compiler that is needed for

-dnl multi-threaded programs (defaults to the value of CC otherwise).

-dnl (This is necessary on AIX to use the special cc_r compiler alias.)

-dnl

-dnl If you are only building threads programs, you may wish to

-dnl use these variables in your default LIBS, CFLAGS, and CC:

-dnl

-dnl        LIBS="$PTHREAD_LIBS $LIBS"

-dnl        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

-dnl        CC="$PTHREAD_CC"

-dnl

-dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute

-dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE

-dnl to that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).

-dnl

-dnl ACTION-IF-FOUND is a list of shell commands to run if a threads

-dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands

-dnl to run it if it is not found.  If ACTION-IF-FOUND is not specified,

-dnl the default action will define HAVE_PTHREAD.

-dnl

-dnl Please let the authors know if this macro fails on any platform,

-dnl or if you have any other suggestions or comments.  This macro was

-dnl based on work by SGJ on autoconf scripts for FFTW (www.fftw.org)

-dnl (with help from M. Frigo), as well as ac_pthread and hb_pthread

-dnl macros posted by AFC to the autoconf macro repository.  We are also

-dnl grateful for the helpful feedback of numerous users.

-dnl

-dnl @author Steven G. Johnson <stevenj@alum.mit.edu> and Alejandro Forero Cuervo <bachue@bachue.com>

-

-AC_DEFUN([ACX_PTHREAD], [

-AC_REQUIRE([AC_CANONICAL_HOST])

-acx_pthread_ok=no

-

-# We used to check for pthread.h first, but this fails if pthread.h

-# requires special compiler flags (e.g. on True64 or Sequent).

-# It gets checked for in the link test anyway.

-

-# First of all, check if the user has set any of the PTHREAD_LIBS,

-# etcetera environment variables, and if threads linking works using

-# them:

-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then

-        save_CFLAGS="$CFLAGS"

-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

-        save_LIBS="$LIBS"

-        LIBS="$PTHREAD_LIBS $LIBS"

-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])

-        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)

-        AC_MSG_RESULT($acx_pthread_ok)

-        if test x"$acx_pthread_ok" = xno; then

-                PTHREAD_LIBS=""

-                PTHREAD_CFLAGS=""

-        fi

-        LIBS="$save_LIBS"

-        CFLAGS="$save_CFLAGS"

-fi

-

-# We must check for the threads library under a number of different

-# names; the ordering is very important because some systems

-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the

-# libraries is broken (non-POSIX).

-

-# Create a list of thread flags to try.  Items starting with a "-" are

-# C compiler flags, and other items are library names, except for "none"

-# which indicates that we try without any flags at all.

-

-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt"

-

-# The ordering *is* (sometimes) important.  Some notes on the

-# individual items follow:

-

-# pthreads: AIX (must check this before -lpthread)

-# none: in case threads are in libc; should be tried before -Kthread and

-#       other compiler flags to prevent continual compiler warnings

-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)

-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)

-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)

-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)

-# -pthreads: Solaris/gcc

-# -mthreads: Mingw32/gcc, Lynx/gcc

-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it

-#      doesn't hurt to check since this sometimes defines pthreads too;

-#      also defines -D_REENTRANT)

-# pthread: Linux, etcetera

-# --thread-safe: KAI C++

-

-case "$host" in

-        *-*-solaris*)

-

-        # On Solaris (at least, for some versions), libc contains stubbed

-        # (non-functional) versions of the pthreads routines, so link-based

-        # tests will erroneously succeed.  (We need to link with -pthread or

-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather

-        # a function called by this macro, so we could check for that, but

-        # who knows whether they'll stub that too in a future libc.)  So,

-        # we'll just look for -pthreads and -lpthread first:

-

-        acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"

-        ;;

-esac

-

-if test x"$acx_pthread_ok" = xno; then

-for flag in $acx_pthread_flags; do

-

-        case $flag in

-                none)

-                AC_MSG_CHECKING([whether pthreads work without any flags])

-                ;;

-

-                -*)

-                AC_MSG_CHECKING([whether pthreads work with $flag])

-                PTHREAD_CFLAGS="$flag"

-                ;;

-

-                *)

-                AC_MSG_CHECKING([for the pthreads library -l$flag])

-                PTHREAD_LIBS="-l$flag"

-                ;;

-        esac

-

-        save_LIBS="$LIBS"

-        save_CFLAGS="$CFLAGS"

-        LIBS="$PTHREAD_LIBS $LIBS"

-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

-

-        # Check for various functions.  We must include pthread.h,

-        # since some functions may be macros.  (On the Sequent, we

-        # need a special flag -Kthread to make this header compile.)

-        # We check for pthread_join because it is in -lpthread on IRIX

-        # while pthread_create is in libc.  We check for pthread_attr_init

-        # due to DEC craziness with -lpthreads.  We check for

-        # pthread_cleanup_push because it is one of the few pthread

-        # functions on Solaris that doesn't have a non-functional libc stub.

-        # We try pthread_create on general principles.

-        AC_TRY_LINK([#include <pthread.h>],

-                    [pthread_t th; pthread_join(th, 0);

-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);

-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],

-                    [acx_pthread_ok=yes])

-

-        LIBS="$save_LIBS"

-        CFLAGS="$save_CFLAGS"

-

-        AC_MSG_RESULT($acx_pthread_ok)

-        if test "x$acx_pthread_ok" = xyes; then

-                break;

-        fi

-

-        PTHREAD_LIBS=""

-        PTHREAD_CFLAGS=""

-done

-fi

-

-# Various other checks:

-if test "x$acx_pthread_ok" = xyes; then

-        save_LIBS="$LIBS"

-        LIBS="$PTHREAD_LIBS $LIBS"

-        save_CFLAGS="$CFLAGS"

-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

-

-        # Detect AIX lossage: threads are created detached by default

-        # and the JOINABLE attribute has a nonstandard name (UNDETACHED).

-        AC_MSG_CHECKING([for joinable pthread attribute])

-        AC_TRY_LINK([#include <pthread.h>],

-                    [int attr=PTHREAD_CREATE_JOINABLE;],

-                    ok=PTHREAD_CREATE_JOINABLE, ok=unknown)

-        if test x"$ok" = xunknown; then

-                AC_TRY_LINK([#include <pthread.h>],

-                            [int attr=PTHREAD_CREATE_UNDETACHED;],

-                            ok=PTHREAD_CREATE_UNDETACHED, ok=unknown)

-        fi

-        if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then

-                AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok,

-                          [Define to the necessary symbol if this constant

-                           uses a non-standard name on your system.])

-        fi

-        AC_MSG_RESULT(${ok})

-        if test x"$ok" = xunknown; then

-                AC_MSG_WARN([we do not know how to create joinable pthreads])

-        fi

-

-        AC_MSG_CHECKING([if more special flags are required for pthreads])

-        flag=no

-        case "$host" in

-                *-*-aix* | *-freebsd*)               flag="-D_THREAD_SAFE";;

-                *-*-solaris* | alpha*-osf* | *linux*) flag="-D_REENTRANT";;

-        esac

-        AC_MSG_RESULT(${flag})

-        if test "x$flag" != xno; then

-                PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"

-        fi

-

-        LIBS="$save_LIBS"

-        CFLAGS="$save_CFLAGS"

-

-        # More AIX lossage: must compile with cc_r

-        AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})

-else

-        PTHREAD_CC="$CC"

-fi

-

-AC_SUBST(PTHREAD_LIBS)

-AC_SUBST(PTHREAD_CFLAGS)

-AC_SUBST(PTHREAD_CC)

-

-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:

-if test x"$acx_pthread_ok" = xyes; then

-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])

-        :

-else

-        acx_pthread_ok=no

-        $2

-fi

-

-])dnl ACX_PTHREAD

@@ -28,7 +28,6 @@

 #include "buffer.h"

 #include "error.h"

 #include "mtu.h"

-#include "thread.h"

 #include "memdbg.h"

@@ -299,10 +298,8 @@ gc_malloc (size_t size, bool clear, struct gc_arena *a)

 #endif

       check_malloc_return (e);

       ret = (char *) e + sizeof (struct gc_entry);

-      /*mutex_lock_static (L_GC_MALLOC);*/

       e->next = a->list;

       a->list = e;

-      /*mutex_unlock_static (L_GC_MALLOC);*/

     }

   else

     {

@@ -324,10 +321,8 @@ void

 x_gc_free (struct gc_arena *a)

 {

   struct gc_entry *e;

-  /*mutex_lock_static (L_GC_MALLOC);*/

   e = a->list;

   a->list = NULL;

-  /*mutex_unlock_static (L_GC_MALLOC);*/

   while (e != NULL)

     {

@@ -26,7 +26,6 @@

 #define BUFFER_H

 #include "basic.h"

-#include "thread.h"

 #define BUF_SIZE_MAX 1000000

@@ -158,12 +158,6 @@ AC_ARG_ENABLE(small,

    [SMALL="no"]

 )

-AC_ARG_ENABLE(pthread,

-   [  --enable-pthread        Enable pthread support (Experimental for OpenVPN 2.0)],

-   [PTHREAD="$enableval"],

-   [PTHREAD="no"]

-)

-

 AC_ARG_ENABLE(password-save,

    [  --enable-password-save  Allow --askpass and --auth-user-pass passwords to be read from a file],

    [PASSWORD_SAVE="$enableval"],

@@ -581,32 +575,6 @@ if test "$MEMCHECK" = "valgrind"; then

 fi

 dnl

-dnl check for pthread library

-dnl

-

-if test "$PTHREAD" = "yes"; then

-  AC_CHECKING([for pthread support])

-  AC_MSG_RESULT([********* WARNING: pthread support is experimental for OpenVPN 2.0])

-  ACX_PTHREAD(

-        [

-	    case "$host" in

-	    *openbsd*)

-		AC_MSG_RESULT([WARNING: pthread support on OpenBSD is unstable!])

-		CFLAGS="$CFLAGS -pthread"

-		;;

-	    esac

-	    LIBS="$PTHREAD_LIBS $LIBS"

-	    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

-	    CC="$PTHREAD_CC"

-	    AC_DEFINE(USE_PTHREAD, 1, [Use pthread-based multithreading])

-	],

-	[

-	    AC_MSG_RESULT([I don't know how to build with pthread support on this platform.])

-	    AC_MSG_ERROR([try ./configure --disable-pthread])

-	])

-fi

-

-dnl

 dnl check for dmalloc library

 dnl

@@ -615,11 +583,7 @@ if test "$MEMCHECK" = "dmalloc"; then

    AC_CHECK_HEADER(dmalloc.h, 

         [AC_CHECK_LIB(dmalloc, malloc,

 	    [

-               if test "$PTHREAD" = "yes"; then

-                   OPENVPN_ADD_LIBS(-ldmallocth)

-               else

-                   OPENVPN_ADD_LIBS(-ldmalloc)

-               fi

+               OPENVPN_ADD_LIBS(-ldmalloc)

 	       AC_DEFINE(DMALLOC, 1, [Use dmalloc memory debugging library])

 	    ],

 	    [AC_MSG_ERROR([dmalloc library not found.])]

@@ -29,7 +29,6 @@

 #include "crypto.h"

 #include "error.h"

 #include "misc.h"

-#include "thread.h"

 #include "memdbg.h"

@@ -1702,7 +1701,6 @@ prng_bytes (uint8_t *output, int len)

     {

       EVP_MD_CTX ctx;

       const int md_size = EVP_MD_size (nonce_md);

-      mutex_lock_static (L_PRNG);

       while (len > 0)

 	{

 	  unsigned int outlen = 0;

@@ -1716,7 +1714,6 @@ prng_bytes (uint8_t *output, int len)

 	  output += blen;

 	  len -= blen;

 	}

-      mutex_unlock_static (L_PRNG);

     }

   else

     RAND_bytes (output, len);

@@ -470,5 +470,7 @@ int SSL_CTX_use_CryptoAPI_certificate(SSL_CTX *ssl_ctx, const char *cert_prop)

 }

 #else

+#ifdef _MSC_VER  /* Dummy function needed to avoid empty file compiler warning in Microsoft VC */

 static void dummy (void) {}

+#endif

 #endif				/* WIN32 */

@@ -26,7 +26,6 @@

 #include "error.h"

 #include "buffer.h"

-#include "thread.h"

 #include "misc.h"

 #include "win32.h"

 #include "socket.h"

@@ -229,8 +228,6 @@ void x_msg (const unsigned int flags, const char *format, ...)

   gc_init (&gc);

-  mutex_lock_static (L_MSG);

-

   m1 = (char *) gc_malloc (ERR_BUF_SIZE, false, &gc);

   m2 = (char *) gc_malloc (ERR_BUF_SIZE, false, &gc);

@@ -330,22 +327,12 @@ void x_msg (const unsigned int flags, const char *format, ...)

 	    }

 	  else

 	    {

-#ifdef USE_PTHREAD

-	      fprintf (fp, "%s [%d] %s%s%s%s",

-		       time_string (0, 0, show_usec, &gc),

-		       (int) openvpn_thread_self (),

-		       prefix,

-		       prefix_sep,

-		       m1,

-		       (flags&M_NOLF) ? "" : "\n");

-#else

 	      fprintf (fp, "%s %s%s%s%s",

 		       time_string (0, 0, show_usec, &gc),

 		       prefix,

 		       prefix_sep,

 		       m1,

 		       (flags&M_NOLF) ? "" : "\n");

-#endif

 	    }

 	  fflush(fp);

 	  ++x_msg_line_num;

@@ -355,8 +342,6 @@ void x_msg (const unsigned int flags, const char *format, ...)

   if (flags & M_FATAL)

     msg (M_INFO, "Exiting");

-  mutex_unlock_static (L_MSG);

-  

   if (flags & M_FATAL)

     openvpn_exit (OPENVPN_EXIT_STATUS_ERROR); /* exit point */

@@ -653,10 +638,6 @@ x_check_status (int status,

  */

 const char *x_msg_prefix; /* GLOBAL */

-#ifdef USE_PTHREAD

-pthread_key_t x_msg_prefix_key; /* GLOBAL */

-#endif

-

 /*

  * Allow MSG to be redirected through a virtual_output object

  */

@@ -664,26 +645,6 @@ pthread_key_t x_msg_prefix_key; /* GLOBAL */

 const struct virtual_output *x_msg_virtual_output; /* GLOBAL */

 /*

- * Init thread-local variables

- */

-

-void

-msg_thread_init (void)

-{

-#ifdef USE_PTHREAD

-  ASSERT (!pthread_key_create (&x_msg_prefix_key, NULL));

-#endif

-}

-

-void

-msg_thread_uninit (void)

-{

-#ifdef USE_PTHREAD

-  pthread_key_delete (x_msg_prefix_key);

-#endif

-}

-

-/*

  * Exiting.

  */

@@ -26,7 +26,6 @@

 #define ERROR_H

 #include "basic.h"

-#include "thread.h"

 /* #define ABORT_ON_ERROR */

@@ -282,34 +281,18 @@ set_check_status_error_delay (unsigned int milliseconds)

 extern const char *x_msg_prefix;

-#ifdef USE_PTHREAD

-extern pthread_key_t x_msg_prefix_key;

-#endif

-

 void msg_thread_init (void);

 void msg_thread_uninit (void);

 static inline void

 msg_set_prefix (const char *prefix)

 {

-#ifdef USE_PTHREAD

-  if (openvpn_thread_enabled ())

-    {

-      ASSERT (!pthread_setspecific (x_msg_prefix_key, prefix));

-    }

-  else

-#endif

     x_msg_prefix = prefix;

 }

 static inline const char *

 msg_get_prefix (void)

 {

-#ifdef USE_PTHREAD

-  if (openvpn_thread_enabled ())

-    return (const char *) pthread_getspecific (x_msg_prefix_key);

-  else

-#endif

     return x_msg_prefix;

 }

@@ -454,7 +454,6 @@ encrypt_sign (struct context *c, bool comp_frag)

    */

   if (c->c2.tls_multi)

     {

-      /*tls_mutex_lock (c->c2.tls_multi);*/

       tls_pre_encrypt (c->c2.tls_multi, &c->c2.buf, &c->c2.crypto_options);

     }

 #endif

@@ -482,7 +481,6 @@ encrypt_sign (struct context *c, bool comp_frag)

   if (c->c2.tls_multi)

     {

       tls_post_encrypt (c->c2.tls_multi, &c->c2.buf);

-      /*tls_mutex_unlock (c->c2.tls_multi);*/

     }

 #endif

 #endif

@@ -801,7 +799,6 @@ process_incoming_link (struct context *c)

 	   * will load crypto_options with the correct encryption key

 	   * and return false.

 	   */

-	  /*tls_mutex_lock (c->c2.tls_multi);*/

 	  if (tls_pre_decrypt (c->c2.tls_multi, &c->c2.from, &c->c2.buf, &c->c2.crypto_options))

 	    {

 	      interval_action (&c->c2.tmp_int);

@@ -824,13 +821,6 @@ process_incoming_link (struct context *c)

       /* authenticate and decrypt the incoming packet */

       decrypt_status = openvpn_decrypt (&c->c2.buf, c->c2.buffers->decrypt_buf, &c->c2.crypto_options, &c->c2.frame);

-#ifdef USE_SSL

-      if (c->c2.tls_multi)

-	{

-	  /*tls_mutex_unlock (c->c2.tls_multi);*/

-	}

-#endif

-      

       if (!decrypt_status && link_socket_connection_oriented (c->c2.link_socket))

 	{

 	  /* decryption errors are fatal in TCP mode */

@@ -139,7 +139,8 @@ LPCTSTR getIeHttpProxy()

     return(NULL);

   }

 }

-

 #else

+#ifdef _MSC_VER  /* Dummy function needed to avoid empty file compiler warning in Microsoft VC */

 static void dummy (void) {}

+#endif

 #endif				/* WIN32 */

@@ -718,8 +718,6 @@ init_static (void)

 void

 uninit_static (void)

 {

-  openvpn_thread_cleanup ();

-

 #ifdef USE_CRYPTO

   free_ssl_lib ();

 #endif

@@ -3505,23 +3503,6 @@ close_context (struct context *c, int sig, unsigned int flags)

 #ifdef USE_CRYPTO

-static void

-test_malloc (void)

-{

-  int i, j;

-  msg (M_INFO, "Multithreaded malloc test...");

-  for (i = 0; i < 25; ++i)

-    {

-      struct gc_arena gc = gc_new ();

-      const int limit = get_random () & 0x03FF;

-      for (j = 0; j < limit; ++j)

-	{

-	  gc_malloc (get_random () & 0x03FF, false, &gc);

-	}

-      gc_free (&gc);

-    }

-}

-

 /*

  * Do a loopback test

  * on the crypto subsystem.

@@ -3531,50 +3512,19 @@ test_crypto_thread (void *arg)

 {

   struct context *c = (struct context *) arg;

   const struct options *options = &c->options;

-#if defined(USE_PTHREAD)

-  struct context *child = NULL;

-  openvpn_thread_t child_id = 0;

-#endif

   ASSERT (options->test_crypto);

   init_verb_mute (c, IVM_LEVEL_1);

   context_init_1 (c);

   do_init_crypto_static (c, 0);

-#if defined(USE_PTHREAD)

-  {

-    if (c->first_time && options->n_threads > 1)

-      {

-	if (options->n_threads > 2)

-	  msg (M_FATAL, "ERROR: --test-crypto option only works with --threads set to 1 or 2");

-	openvpn_thread_init ();

-	ALLOC_OBJ (child, struct context);

-	context_clear (child);

-	child->options = *options;

-	options_detach (&child->options);

-	child->first_time = false;

-	child_id = openvpn_thread_create (test_crypto_thread, (void *) child);

-      }

-  }

-#endif

   frame_finalize_options (c, options);

-#if defined(USE_PTHREAD)

-  if (options->n_threads == 2)

-    test_malloc ();

-#endif

-

   test_crypto (&c->c2.crypto_options, &c->c2.frame);

   key_schedule_free (&c->c1.ks, true);

   packet_id_free (&c->c2.packet_id);

-#if defined(USE_PTHREAD)

-  if (c->first_time && options->n_threads > 1)

-    openvpn_thread_join (child_id);

-  if (child)

-    free (child);

-#endif

   context_gc_free (c);

   return NULL;

 }

@@ -52,7 +52,6 @@ hash_init (const int n_buckets,

     {

       struct hash_bucket *b = &h->buckets[i];

       b->list = NULL;

-      mutex_init (&b->mutex);

     }

   return h;

 }

@@ -66,7 +65,6 @@ hash_free (struct hash *hash)

       struct hash_bucket *b = &hash->buckets[i];

       struct hash_element *he = b->list;

-      mutex_destroy (&b->mutex);

       while (he)

 	{

 	  struct hash_element *next = he->next;

@@ -148,7 +146,6 @@ hash_add (struct hash *hash, const void *key, void *value, bool replace)

   hv = hash_value (hash, key);

   bucket = &hash->buckets[hv & hash->mask];

-  mutex_lock (&bucket->mutex);

   if ((he = hash_lookup_fast (hash, bucket, key, hv))) /* already exists? */

     {

@@ -164,18 +161,16 @@ hash_add (struct hash *hash, const void *key, void *value, bool replace)

       ret = true;

     }

-  mutex_unlock (&bucket->mutex);

-

   return ret;

 }

 void

-hash_remove_by_value (struct hash *hash, void *value, bool autolock)

+hash_remove_by_value (struct hash *hash, void *value)

 {

   struct hash_iterator hi;

   struct hash_element *he;

-  hash_iterator_init (hash, &hi, autolock);

+  hash_iterator_init (hash, &hi);

   while ((he = hash_iterator_next (&hi)))

     {

       if (he->value == value)

@@ -226,7 +221,6 @@ void_ptr_compare_function (const void *key1, const void *key2)

 void

 hash_iterator_init_range (struct hash *hash,

 		       struct hash_iterator *hi,

-		       bool autolock,

 		       int start_bucket,

 		       int end_bucket)

 {

@@ -238,7 +232,6 @@ hash_iterator_init_range (struct hash *hash,

   hi->hash = hash;

   hi->elem = NULL;

   hi->bucket = NULL;

-  hi->autolock = autolock;

   hi->last = NULL;

   hi->bucket_marked = false;

   hi->bucket_index_start = start_bucket;

@@ -248,19 +241,14 @@ hash_iterator_init_range (struct hash *hash,

 void

 hash_iterator_init (struct hash *hash,

-		    struct hash_iterator *hi,

-		    bool autolock)

+		    struct hash_iterator *hi)

 {

-  hash_iterator_init_range (hash, hi, autolock, 0, hash->n_buckets);

+  hash_iterator_init_range (hash, hi, 0, hash->n_buckets);

 }

 static inline void

 hash_iterator_lock (struct hash_iterator *hi, struct hash_bucket *b)

 {

-  if (hi->autolock)

-    {

-      mutex_lock (&b->mutex);

-    }

   hi->bucket = b;

   hi->last = NULL;

   hi->bucket_marked = false;

@@ -276,10 +264,6 @@ hash_iterator_unlock (struct hash_iterator *hi)

 	  hash_remove_marked (hi->hash, hi->bucket);

 	  hi->bucket_marked = false;

 	}

-      if (hi->autolock)

-	{

-	  mutex_unlock (&hi->bucket->mutex);

-	}

       hi->bucket = NULL;

       hi->last = NULL;

     }

@@ -40,7 +40,6 @@

 /*#define LIST_TEST*/

 #include "basic.h"

-#include "thread.h"

 #include "buffer.h"

 #define hashsize(n) ((uint32_t)1<<(n))

@@ -56,7 +55,6 @@ struct hash_element

 struct hash_bucket

 {

-  MUTEX_DEFINE (mutex);

   struct hash_element *list;

 };

@@ -90,7 +88,7 @@ bool hash_remove_fast (struct hash *hash,

 		       const void *key,

 		       uint32_t hv);

-void hash_remove_by_value (struct hash *hash, void *value, bool autolock);

+void hash_remove_by_value (struct hash *hash, void *value);

 struct hash_iterator

 {

@@ -100,18 +98,16 @@ struct hash_iterator

   struct hash_element *elem;

   struct hash_element *last;

   bool bucket_marked;

-  bool autolock;

   int bucket_index_start;

   int bucket_index_end;

 };

 void hash_iterator_init_range (struct hash *hash,

 			       struct hash_iterator *hi,

-			       bool autolock,

 			       int start_bucket,

 			       int end_bucket);

-void hash_iterator_init (struct hash *hash, struct hash_iterator *iter, bool autolock);

+void hash_iterator_init (struct hash *hash, struct hash_iterator *iter);

 struct hash_element *hash_iterator_next (struct hash_iterator *hi);

 void hash_iterator_delete_element (struct hash_iterator *hi);

 void hash_iterator_free (struct hash_iterator *hi);

@@ -149,40 +145,21 @@ hash_bucket (struct hash *hash, uint32_t hv)

   return &hash->buckets[hv & hash->mask];

 }

-static inline void

-hash_bucket_lock (struct hash_bucket *bucket)

-{

-  mutex_lock (&bucket->mutex);

-}

-

-static inline void

-hash_bucket_unlock (struct hash_bucket *bucket)

-{

-  mutex_unlock (&bucket->mutex);

-}

-

 static inline void *

-hash_lookup_lock (struct hash *hash, const void *key, uint32_t hv)

+hash_lookup (struct hash *hash, const void *key)

 {

   void *ret = NULL;

   struct hash_element *he;

+  uint32_t hv = hash_value (hash, key);

   struct hash_bucket *bucket = &hash->buckets[hv & hash->mask];

-  mutex_lock (&bucket->mutex);

   he = hash_lookup_fast (hash, bucket, key, hv);

   if (he)

     ret = he->value;

-  mutex_unlock (&bucket->mutex);

   return ret;

 }

-static inline void *

-hash_lookup (struct hash *hash, const void *key)

-{

-  return hash_lookup_lock (hash, key, hash_value (hash, key));

-}

-

 /* NOTE: assumes that key is not a duplicate */

 static inline void

 hash_add_fast (struct hash *hash,

@@ -211,9 +188,7 @@ hash_remove (struct hash *hash, const void *key)

   hv = hash_value (hash, key);

   bucket = &hash->buckets[hv & hash->mask];

-  mutex_lock (&bucket->mutex);

   ret = hash_remove_fast (hash, bucket, key, hv);

-  mutex_unlock (&bucket->mutex);

   return ret;

 }

@@ -38,7 +38,6 @@ mbuf_init (unsigned int size)

 {

   struct mbuf_set *ret;

   ALLOC_OBJ_CLEAR (ret, struct mbuf_set);

-  mutex_init (&ret->mutex);

   ret->capacity = adjust_power_of_2 (size);

   ALLOC_ARRAY (ret->array, struct mbuf_item, ret->capacity);

   return ret;

@@ -56,7 +55,6 @@ mbuf_free (struct mbuf_set *ms)

 	  mbuf_free_buf (item->buffer);

 	}

       free (ms->array);

-      mutex_destroy (&ms->mutex);

       free (ms);

     }

 }

@@ -89,11 +87,10 @@ void

 mbuf_add_item (struct mbuf_set *ms, const struct mbuf_item *item)

 {

   ASSERT (ms);

-  mutex_lock (&ms->mutex);

   if (ms->len == ms->capacity)

     {

       struct mbuf_item rm;

-      ASSERT (mbuf_extract_item (ms, &rm, false));

+      ASSERT (mbuf_extract_item (ms, &rm));

       mbuf_free_buf (rm.buffer);

       msg (D_MULTI_DROPPED, "MBUF: mbuf packet dropped");

     }

@@ -104,17 +101,14 @@ mbuf_add_item (struct mbuf_set *ms, const struct mbuf_item *item)

   if (++ms->len > ms->max_queued)

     ms->max_queued = ms->len;

   ++item->buffer->refcount;

-  mutex_unlock (&ms->mutex);

 }

 bool

-mbuf_extract_item (struct mbuf_set *ms, struct mbuf_item *item, const bool lock)

+mbuf_extract_item (struct mbuf_set *ms, struct mbuf_item *item)

 {

   bool ret = false;

   if (ms)