Kouhei Sutou
null+****@clear*****
Sat Apr 2 22:45:46 JST 2016
Kouhei Sutou 2016-04-02 22:45:46 +0900 (Sat, 02 Apr 2016) New Revision: 0267f2a64d3efbb8f1765de6ca6126829d25c9a3 https://github.com/groonga/groonga/commit/0267f2a64d3efbb8f1765de6ca6126829d25c9a3 Message: request_timer: remove unused ctx Modified files: include/groonga/request_timer.h lib/request_timer.c Modified: include/groonga/request_timer.h (+2 -3) =================================================================== --- include/groonga/request_timer.h 2016-04-01 18:45:09 +0900 (814f448) +++ include/groonga/request_timer.h 2016-04-02 22:45:46 +0900 (7009a59) @@ -32,11 +32,10 @@ typedef struct _grn_request_timer { void (*unregister_func)(grn_ctx *ctx, void *timer_id, void *user_data); - void (*fin_func)(grn_ctx *ctx, - void *user_data); + void (*fin_func)(void *user_data); } grn_request_timer; -GRN_API void grn_request_timer_set(grn_ctx *ctx, grn_request_timer *timer); +GRN_API void grn_request_timer_set(grn_request_timer *timer); GRN_API void *grn_request_timer_register(grn_ctx *ctx, const char *request_id, Modified: lib/request_timer.c (+3 -11) =================================================================== --- lib/request_timer.c 2016-04-01 18:45:09 +0900 (3e7ca5d) +++ lib/request_timer.c 2016-04-02 22:45:46 +0900 (9ed7008) @@ -19,17 +19,12 @@ #include "grn_ctx.h" #include "grn_request_timer.h" -static grn_ctx grn_request_timer_ctx; static grn_mutex grn_request_timer_mutex; static grn_request_timer grn_current_request_timer = { 0 }; grn_bool grn_request_timer_init(void) { - grn_ctx *ctx = &grn_request_timer_ctx; - - grn_ctx_init(ctx, 0); - MUTEX_INIT(grn_request_timer_mutex); return GRN_TRUE; @@ -69,12 +64,12 @@ grn_request_timer_unregister(grn_ctx *ctx, void *timer_id) } void -grn_request_timer_set(grn_ctx *ctx, grn_request_timer *timer) +grn_request_timer_set(grn_request_timer *timer) { MUTEX_LOCK(grn_request_timer_mutex); if (grn_current_request_timer.fin_func) { void *user_data = grn_current_request_timer.user_data; - grn_current_request_timer.fin_func(ctx, user_data); + grn_current_request_timer.fin_func(user_data); } if (timer) { grn_current_request_timer = *timer; @@ -87,9 +82,6 @@ grn_request_timer_set(grn_ctx *ctx, grn_request_timer *timer) void grn_request_timer_fin(void) { - grn_ctx *ctx = &grn_request_timer_ctx; - - grn_request_timer_set(ctx, NULL); + grn_request_timer_set(NULL); MUTEX_FIN(grn_request_timer_mutex); - grn_ctx_fin(ctx); } -------------- next part -------------- HTML����������������������������...Download