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

Remove irrelevant rock

Browse Source
This commit is contained in:
jun7 2018-06-23 14:31:24 +09:00
parent 2d800947a8
commit 2e3b9e2cb7
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -28,7 +28,7 @@ librun.o: wyebrun.c wyebrun.h makefile
testrun: wyebrun.c wyebrun.h makefile testrun: wyebrun.c wyebrun.h makefile
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< \ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< \
`pkg-config --cflags --libs glib-2.0 gio-2.0` \ `pkg-config --cflags --libs glib-2.0 gio-2.0` \
-DDEBUG=1 -DTESTER=1 $(DDEBUG) -DTESTER=1
clean: clean:
rm -f adblock.so rm -f adblock.so

33
wyebrun.c
View File

@ -41,7 +41,6 @@ along with wyebrun. If not, see <http://www.gnu.org/licenses/>.
#define P(f, ...) g_print(#f"\n", __VA_ARGS__); #define P(f, ...) g_print(#f"\n", __VA_ARGS__);
#if DEBUG #if DEBUG
static gint64 start;
# define D(f, ...) g_print("#"#f"\n", __VA_ARGS__); # define D(f, ...) g_print("#"#f"\n", __VA_ARGS__);
# define DD(a) g_print("#"#a"\n"); # define DD(a) g_print("#"#a"\n");
#else #else
@ -96,9 +95,6 @@ static char *preparepp(char *exe, char *name)
static bool ipcsend(char *exe, char *name, static bool ipcsend(char *exe, char *name,
Com type, char *caller, char *data) Com type, char *caller, char *data)
{ {
static GMutex m;
g_mutex_lock(&m);
char *path = preparepp(exe, name); char *path = preparepp(exe, name);
char *esc = g_strescape(data ?: "", ""); char *esc = g_strescape(data ?: "", "");
@ -123,12 +119,11 @@ static bool ipcsend(char *exe, char *name,
ret = write(pp, line, len) == len; ret = write(pp, line, len) == len;
close(pp); close(pp);
} }
g_free(line); g_free(line);
g_free(path); g_free(path);
g_mutex_unlock(&m); //D(ipcsend ret %d, ret)
D(ipcsend ret %d, ret)
return ret; return ret;
} }
@ -488,10 +483,11 @@ guint wyebloop(char *exe, int sec)
} }
#if DEBUG #if TESTER
static void testget(gpointer p, gpointer ap) static void testget(gpointer p, gpointer ap)
{ {
D(ret %s - %s, wyebget(ap, p), (char *)p) P(ret %s - %s, wyebget(ap, p), (char *)p)
// wyebget(ap, p);
g_free(p); g_free(p);
} }
#endif #endif
@ -508,13 +504,13 @@ static gboolean tcinputcb(GIOChannel *ch, GIOCondition c, char *exe)
if (!strlen(line)) if (!strlen(line))
exit(0); exit(0);
#if DEBUG #if TESTER
if (g_str_has_prefix(line, "l")) if (g_str_has_prefix(line, "l"))
{ {
GThreadPool *pool = g_thread_pool_new(testget, exe, 44, false, NULL); GThreadPool *pool = g_thread_pool_new(testget, exe, 66, false, NULL);
start = g_get_monotonic_time(); gint64 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));
@ -531,15 +527,18 @@ static gboolean tcinputcb(GIOChannel *ch, GIOCondition c, char *exe)
g_free(data); g_free(data);
} }
else else
g_thread_pool_push(pool, g_strdup(is), NULL); {
// wyebget(exe, is); // wyebget(exe, is);
g_thread_pool_push(pool, is, NULL);
is = NULL;
}
g_free(is); g_free(is);
} }
g_thread_pool_free(pool, false, true); g_thread_pool_free(pool, false, true);
gint64 now = g_get_monotonic_time(); gint64 now = g_get_monotonic_time();
D(time %f, (now - start) / 1000000.0) P(time %f, (now - start) / 1000000.0)
} }
else else
#endif #endif
@ -646,9 +645,7 @@ static char *testdata(char *data)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
#if DEBUG // start = g_get_monotonic_time();
start = g_get_monotonic_time();
#endif
// gint64 now = g_get_monotonic_time(); // gint64 now = g_get_monotonic_time();
// D(time %ld %ld, now - start, now) // D(time %ld %ld, now - start, now)