open.source/wyebadblock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lacking of m lock

Browse Source
This commit is contained in:
jun7 2018-06-07 00:59:42 +09:00
parent d5f8e3fbec
commit dd57dd303a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wyebrun.c
View File

@ -266,6 +266,7 @@ typedef struct {
} Client; } Client;
static GSList *rmpath = NULL; static GSList *rmpath = NULL;
static GMutex rmm;
static void __attribute__((destructor)) removepp() static void __attribute__((destructor)) removepp()
{ {
for (; rmpath; rmpath = rmpath->next) for (; rmpath; rmpath = rmpath->next)
@ -282,7 +283,9 @@ static Client *makecli()
cli->loop = g_main_loop_new(cli->wctx, true); cli->loop = g_main_loop_new(cli->wctx, true);
cli->watch = ipcwatch(CLIDIR, cli->pid, cli->wctx, cli); cli->watch = ipcwatch(CLIDIR, cli->pid, cli->wctx, cli);
cli->pppath = ipcpath( CLIDIR, cli->pid); cli->pppath = ipcpath( CLIDIR, cli->pid);
g_mutex_lock(&rmm);
rmpath = g_slist_prepend(rmpath, cli->pppath); rmpath = g_slist_prepend(rmpath, cli->pppath);
g_mutex_unlock(&rmm);
g_thread_unref(g_thread_new("wait", (GThreadFunc)g_main_loop_run, cli->loop)); g_thread_unref(g_thread_new("wait", (GThreadFunc)g_main_loop_run, cli->loop));
@ -298,7 +301,9 @@ static void freecli(Client *cli)
g_free(cli->pid); g_free(cli->pid);
g_free(cli->retdata); g_free(cli->retdata);
remove(cli->pppath); remove(cli->pppath);
g_mutex_lock(&rmm);
rmpath = g_slist_remove(rmpath, cli->pppath); rmpath = g_slist_remove(rmpath, cli->pppath);
g_mutex_unlock(&rmm);
g_free(cli->pppath); g_free(cli->pppath);
} }
static Client *getcli() static Client *getcli()
@ -466,7 +471,7 @@ guint wyebloop(char *exe, int sec)
#if DEBUG #if DEBUG
static void testget(gpointer p, gpointer ap) static void testget(gpointer p, gpointer ap)
{ {
D(send %s ret %s, (char *)p, wyebget(ap, p)) D(ret %s - %s, wyebget(ap, p), (char *)p)
g_free(p); g_free(p);
} }
#endif #endif
@ -486,10 +491,10 @@ static gboolean tcinputcb(GIOChannel *ch, GIOCondition c, char *exe)
#if DEBUG #if DEBUG
if (g_str_has_prefix(line, "l")) if (g_str_has_prefix(line, "l"))
{ {
GThreadPool *pool = g_thread_pool_new(testget, exe, 4, false, NULL); GThreadPool *pool = g_thread_pool_new(testget, exe, 44, false, NULL);
start = g_get_monotonic_time(); start = g_get_monotonic_time();
for (int i = 0; i < 10000; i++) for (int i = 0; i < 100000; i++)
{ {
char *is = g_strdup_printf("l%d", i); char *is = g_strdup_printf("l%d", i);
//g_print("loop %d ret %s\n", i, wyebget(exe, is)); //g_print("loop %d ret %s\n", i, wyebget(exe, is));