bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-24 02:55:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

log_mutex init moved to proxymain

Browse Source
This commit is contained in:
z3APA3A 2016-02-05 19:04:16 +03:00
parent 13a7d6be11
commit 6713530fda
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/3proxy.c
View File

@ -510,9 +510,6 @@ int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int
return 1; return 1;
} }
pthread_mutex_init(&log_mutex, NULL);
logmutexinit = 1;
pthread_mutex_init(&config_mutex, NULL); pthread_mutex_init(&config_mutex, NULL);
pthread_mutex_init(&bandlim_mutex, NULL); pthread_mutex_init(&bandlim_mutex, NULL);
pthread_mutex_init(&hash_mutex, NULL); pthread_mutex_init(&hash_mutex, NULL);

10
src/common.c
View File

@ -601,17 +601,11 @@ void lognone(struct clientparam * param, const unsigned char *s) {
if(param->trafcountfunc)(*param->trafcountfunc)(param); if(param->trafcountfunc)(*param->trafcountfunc)(param);
clearstat(param); clearstat(param);
} }
pthread_mutex_t log_mutex;
int logmutexinit = 0;
unsigned char tmpbuf[8192]; unsigned char tmpbuf[8192];
void logstdout(struct clientparam * param, const unsigned char *s) { void logstdout(struct clientparam * param, const unsigned char *s) {
FILE *log; FILE *log;
if(!logmutexinit){
pthread_mutex_init(&log_mutex, NULL);
logmutexinit = 1;
}
pthread_mutex_lock(&log_mutex); pthread_mutex_lock(&log_mutex);
log = param->srv->stdlog?param->srv->stdlog:conf.stdlog?conf.stdlog:stdout; log = param->srv->stdlog?param->srv->stdlog:conf.stdlog?conf.stdlog:stdout;
dobuf(param, tmpbuf, s, NULL); dobuf(param, tmpbuf, s, NULL);
@ -624,10 +618,6 @@ void logstdout(struct clientparam * param, const unsigned char *s) {
#ifndef _WIN32 #ifndef _WIN32
void logsyslog(struct clientparam * param, const unsigned char *s) { void logsyslog(struct clientparam * param, const unsigned char *s) {
if(!logmutexinit){
pthread_mutex_init(&log_mutex, NULL);
logmutexinit = 1;
}
pthread_mutex_lock(&log_mutex); pthread_mutex_lock(&log_mutex);
dobuf(param, tmpbuf, s, NULL); dobuf(param, tmpbuf, s, NULL);
if(!param->nolog)syslog(LOG_INFO, "%s", tmpbuf); if(!param->nolog)syslog(LOG_INFO, "%s", tmpbuf);

1
src/dighosts.c
View File

@ -6,6 +6,7 @@
*/ */
#include "proxy.h" #include "proxy.h"
pthread_mutex_t log_mutex;
int sockgetchar(SOCKET sock, int timeosec, int timeousec){ int sockgetchar(SOCKET sock, int timeosec, int timeousec){

1
src/proxy.h
View File

@ -316,7 +316,6 @@ extern pthread_mutex_t hash_mutex;
extern pthread_mutex_t tc_mutex; extern pthread_mutex_t tc_mutex;
extern pthread_mutex_t pwl_mutex; extern pthread_mutex_t pwl_mutex;
extern pthread_mutex_t log_mutex; extern pthread_mutex_t log_mutex;
extern int logmutexinit;
extern struct datatype datatypes[64]; extern struct datatype datatypes[64];

6
src/proxymain.c
View File

@ -8,6 +8,8 @@
#include "proxy.h" #include "proxy.h"
pthread_mutex_t log_mutex;
int logmutexinit = 0;
#define param ((struct clientparam *) p) #define param ((struct clientparam *) p)
#ifdef _WIN32 #ifdef _WIN32
@ -179,6 +181,10 @@ int MODULEMAINFUNC (int argc, char** argv){
#endif #endif
#endif #endif
if(!logmutexinit){
pthread_mutex_init(&log_mutex, NULL);
logmutexinit = 1;
}
srvinit(&srv, &defparam); srvinit(&srv, &defparam);
srv.pf = childdef.pf; srv.pf = childdef.pf;