Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 773414 - Add PR_DuplicateEnvironment function. r=cjones

Browse Source 
From 2236c867cfc9b25bc1327206da8b4b29a91f65e0 Mon Sep 17 00:00:00 2001
Need to reimplement PR_GetEnv and PR_SetEnv so that we can access
to the lock. This is needed by PR_DuplicateEnvironment, which
was moved to ipc/chromium/src/base/process_util_linux.cc otherwise
the alloc/frees don't get matched up properly.

This is tempoarary until we can get PR_DuplicateEnvironment landed
into NSPR.
---
 configure.in                 |    2 +-
 mozglue/build/BionicGlue.cpp |   44 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)
This commit is contained in:
Dave Hylands 2012-07-12 13:28:14 -07:00
parent 93ff59eabd
commit 351faa429a
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -7072,7 +7072,7 @@ if test "$OS_TARGET" = Android; then
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=dlopen,--wrap=dlclose,--wrap=dlerror,--wrap=dlsym,--wrap=dladdr"
fi
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=fork,--wrap=pthread_atfork,--wrap=raise"
WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=fork,--wrap=pthread_atfork,--wrap=raise,--wrap=PR_GetEnv,--wrap=PR_SetEnv"
fi
dnl ========================================================

44
mozglue/build/BionicGlue.cpp
View File

@ -3,8 +3,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include <unistd.h>
#include <pthread.h>
#include <string.h>
#include <unistd.h>
#include <vector>
#define NS_EXPORT __attribute__ ((visibility("default")))
@ -59,3 +61,43 @@ __wrap_raise(int sig)
return pthread_kill(pthread_self(), sig);
}
/*
* The following wrappers for PR_Xxx are needed until we can get
* PR_DuplicateEnvironment landed in NSPR.
* See see bug 772734 and bug 773414.
*
* We can't #include the pr headers here, and we can't call any of the
* PR/PL functions either, so we just reimplemnt using native code.
*/
static pthread_mutex_t _pr_envLock = PTHREAD_MUTEX_INITIALIZER;
extern "C" NS_EXPORT char*
__wrap_PR_GetEnv(const char *var)
{
char *ev;
pthread_mutex_lock(&_pr_envLock);
ev = getenv(var);
pthread_mutex_unlock(&_pr_envLock);
return ev;
}
extern "C" NS_EXPORT int
__wrap_PR_SetEnv(const char *string)
{
int result;
if ( !strchr(string, '=')) return(-1);
pthread_mutex_lock(&_pr_envLock);
result = putenv(string);
pthread_mutex_unlock(&_pr_envLock);
return (result)? -1 : 0;
}
extern "C" NS_EXPORT pthread_mutex_t *
PR_GetEnvLock(void)
{
return &_pr_envLock;
}