Kouhei Sutou
null+****@clear*****
Sun Apr 3 01:07:04 JST 2016
Kouhei Sutou 2016-04-03 01:07:04 +0900 (Sun, 03 Apr 2016) New Revision: 5e2262afb45040228028ab1034225b1baf434fa3 https://github.com/groonga/groonga/commit/5e2262afb45040228028ab1034225b1baf434fa3 Message: request_timer: remove needless ctx Modified files: include/groonga/request_timer.h lib/ctx.c lib/request_timer.c Modified: include/groonga/request_timer.h (+4 -7) =================================================================== --- include/groonga/request_timer.h 2016-04-03 00:53:15 +0900 (145201c) +++ include/groonga/request_timer.h 2016-04-03 01:07:04 +0900 (c9fa499) @@ -24,13 +24,11 @@ extern "C" { typedef struct _grn_request_timer { void *user_data; - void *(*register_func)(grn_ctx *ctx, - const char *request_id, + void *(*register_func)(const char *request_id, unsigned int request_id_size, double timeout, void *user_data); - void (*unregister_func)(grn_ctx *ctx, - void *timer_id, + void (*unregister_func)(void *timer_id, void *user_data); void (*fin_func)(void *user_data); } grn_request_timer; @@ -39,12 +37,11 @@ typedef struct _grn_request_timer { GRN_API void grn_request_timer_set(grn_request_timer *timer); /* Multithreading safety is depends on grn_request_timer. */ -GRN_API void *grn_request_timer_register(grn_ctx *ctx, - const char *request_id, +GRN_API void *grn_request_timer_register(const char *request_id, unsigned int request_id_size, double timeout); /* Multithreading safety is depends on grn_request_timer. */ -GRN_API void grn_request_timer_unregister(grn_ctx *ctx, void *timer_id); +GRN_API void grn_request_timer_unregister(void *timer_id); #ifdef __cplusplus Modified: lib/ctx.c (+4 -5) =================================================================== --- lib/ctx.c 2016-04-03 00:53:15 +0900 (d25d740) +++ lib/ctx.c 2016-04-03 01:07:04 +0900 (6eff6e5) @@ -1522,8 +1522,7 @@ grn_ctx_qe_exec_uri(grn_ctx *ctx, const char *path, uint32_t path_len) GRN_TEXT_LEN(&request_id)); if (request_timeout > 0) { ctx->impl->current_request_timer_id = - grn_request_timer_register(ctx, - GRN_TEXT_VALUE(&request_id), + grn_request_timer_register(GRN_TEXT_VALUE(&request_id), GRN_TEXT_LEN(&request_id), request_timeout); } @@ -1642,8 +1641,7 @@ grn_ctx_qe_exec(grn_ctx *ctx, const char *str, uint32_t str_len) GRN_TEXT_LEN(&request_id)); if (request_timeout > 0.0) { ctx->impl->current_request_timer_id = - grn_request_timer_register(ctx, - GRN_TEXT_VALUE(&request_id), + grn_request_timer_register(GRN_TEXT_VALUE(&request_id), GRN_TEXT_LEN(&request_id), request_timeout); } @@ -1759,8 +1757,9 @@ grn_ctx_send(grn_ctx *ctx, const char *str, unsigned int str_len, int flags) ERRCLR(ctx); } else { if (ctx->impl->current_request_timer_id) { - grn_request_timer_unregister(ctx, ctx->impl->current_request_timer_id); + void *timer_id = ctx->impl->current_request_timer_id; ctx->impl->current_request_timer_id = NULL; + grn_request_timer_unregister(timer_id); } if (GRN_TEXT_LEN(&ctx->impl->current_request_id) > 0) { grn_obj *request_id = &ctx->impl->current_request_id; Modified: lib/request_timer.c (+4 -6) =================================================================== --- lib/request_timer.c 2016-04-03 00:53:15 +0900 (18c1f43) +++ lib/request_timer.c 2016-04-03 01:07:04 +0900 (572f545) @@ -28,8 +28,7 @@ grn_request_timer_init(void) } void * -grn_request_timer_register(grn_ctx *ctx, - const char *request_id, +grn_request_timer_register(const char *request_id, unsigned int request_id_size, double timeout) { @@ -37,8 +36,7 @@ grn_request_timer_register(grn_ctx *ctx, if (grn_current_request_timer.register_func) { void *user_data = grn_current_request_timer.user_data; - timer_id = grn_current_request_timer.register_func(ctx, - request_id, + timer_id = grn_current_request_timer.register_func(request_id, request_id_size, timeout, user_data); @@ -48,11 +46,11 @@ grn_request_timer_register(grn_ctx *ctx, } void -grn_request_timer_unregister(grn_ctx *ctx, void *timer_id) +grn_request_timer_unregister(void *timer_id) { if (grn_current_request_timer.unregister_func) { void *user_data = grn_current_request_timer.user_data; - grn_current_request_timer.unregister_func(ctx, timer_id, user_data); + grn_current_request_timer.unregister_func(timer_id, user_data); } } -------------- next part -------------- HTML����������������������������...Download