Bug 1026864: prevent malloc from calling wrapped pthread_mutex_lock a…

…nd get rid of LibcAllocator. r=cyu,r=glandium,r=khuey
atilag · Jun 25, 2014 · 01cc0c8 · 01cc0c8
1 parent bba364f
commit 01cc0c8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 46 deletions.
diff --git a/memory/jemalloc/moz.build b/memory/jemalloc/moz.build
@@ -50,6 +50,9 @@ if CONFIG['OS_TARGET'] == 'Linux':
     # For mremap
     DEFINES['_GNU_SOURCE'] = True
 
+if CONFIG['MOZ_NUWA_PROCESS'] and CONFIG['MOZ_JEMALLOC3']:
+    DEFINES['pthread_mutex_lock'] = '__real_pthread_mutex_lock';
+
 DEFINES['abort'] = 'moz_abort'
 
 GENERATED_INCLUDES += ['src/include']

diff --git a/memory/mozjemalloc/moz.build b/memory/mozjemalloc/moz.build
@@ -32,6 +32,9 @@ DEFINES['MOZ_JEMALLOC_IMPL'] = True
 if CONFIG['OS_TARGET'] == 'Linux':
     NO_PGO = True
 
+if CONFIG['MOZ_NUWA_PROCESS']:
+    DEFINES['pthread_mutex_lock'] = '__real_pthread_mutex_lock';
+
 LOCAL_INCLUDES += [
     '/memory/build',
 ]

diff --git a/mozglue/build/Nuwa.cpp b/mozglue/build/Nuwa.cpp
@@ -91,52 +91,7 @@ static bool sNuwaForking = false;
 static NuwaProtoFdInfo sProtoFdInfos[NUWA_TOPLEVEL_MAX];
 static int sProtoFdInfosSize = 0;
 
-template <typename T>
-struct LibcAllocator: public std::allocator<T>
-{
-  LibcAllocator()
-  {
-    void* libcHandle = dlopen("libc.so", RTLD_LAZY);
-    mMallocImpl = reinterpret_cast<void*(*)(size_t)>(dlsym(libcHandle, "malloc"));
-    mFreeImpl = reinterpret_cast<void(*)(void*)>(dlsym(libcHandle, "free"));
-
-    if (!(mMallocImpl && mFreeImpl)) {
-      // libc should be available, or we'll deadlock in using TLSInfoList.
-      abort();
-    }
-  }
-
-  inline typename std::allocator<T>::pointer
-  allocate(typename std::allocator<T>::size_type n,
-           const void * = 0)
-  {
-    return reinterpret_cast<T *>(mMallocImpl(sizeof(T) * n));
-  }
-
-  inline void
-  deallocate(typename std::allocator<T>::pointer p,
-             typename std::allocator<T>::size_type n)
-  {
-    mFreeImpl(p);
-  }
-
-  template<typename U>
-  struct rebind
-  {
-    typedef LibcAllocator<U> other;
-  };
-private:
-  void* (*mMallocImpl)(size_t);
-  void (*mFreeImpl)(void*);
-};
-
-/**
- * TLSInfoList should use malloc() and free() in libc to avoid the deadlock that
- * jemalloc calls into __wrap_pthread_mutex_lock() and then deadlocks while
- * the same thread already acquired sThreadCountLock.
- */
-typedef std::vector<std::pair<pthread_key_t, void *>,
-                    LibcAllocator<std::pair<pthread_key_t, void *> > >
+typedef std::vector<std::pair<pthread_key_t, void *> >
 TLSInfoList;
 
 /**