diff options
| author |  Michael Darakananda <pongad@google.com> | 2017-10-10 15:07:28 +1100 |
|---|---|---|
| committer | Michael Darakananda <pongad@google.com> | 2017-10-10 15:07:28 +1100 |
| commit | df6e3750b24a584daa823e01b2a69ac65f59af83 (patch) | |
| tree | 659cbc6c0021d03564b516110abd4b09bd17ce82 /src/core/lib/iomgr/timer.h | |
| parent | b268629245788bee994e96cb585a3ab2c78bafa8 (diff) | |
| parent | b6142ef1a6dc70565f468346c7935f43dbcb55fa (diff) | |
Merge branch 'master' into fix-php
Diffstat (limited to 'src/core/lib/iomgr/timer.h')
| -rw-r--r-- | src/core/lib/iomgr/timer.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h index ac392f87fe..419e834cf1 100644 --- a/src/core/lib/iomgr/timer.h +++ b/src/core/lib/iomgr/timer.h @@ -32,6 +32,10 @@ #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct grpc_timer grpc_timer; /* Initialize *timer. When expired or canceled, closure will be called with @@ -41,8 +45,7 @@ typedef struct grpc_timer grpc_timer; application callback is also responsible for maintaining information about when to free up any user-level state. */ void grpc_timer_init(grpc_exec_ctx *exec_ctx, grpc_timer *timer, - gpr_timespec deadline, grpc_closure *closure, - gpr_timespec now); + grpc_millis deadline, grpc_closure *closure); /* Initialize *timer without setting it. This can later be passed through the regular init or cancel */ @@ -92,8 +95,8 @@ typedef enum { with high probability at least one thread in the system will see an update at any time slice. */ grpc_timer_check_result grpc_timer_check(grpc_exec_ctx *exec_ctx, - gpr_timespec now, gpr_timespec *next); -void grpc_timer_list_init(gpr_timespec now); + grpc_millis *next); +void grpc_timer_list_init(grpc_exec_ctx *exec_ctx); void grpc_timer_list_shutdown(grpc_exec_ctx *exec_ctx); /* Consume a kick issued by grpc_kick_poller */ @@ -103,4 +106,8 @@ void grpc_timer_consume_kick(void); void grpc_kick_poller(void); +#ifdef __cplusplus +} +#endif + #endif /* GRPC_CORE_LIB_IOMGR_TIMER_H */ |