aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/support/time.c
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nnoble@google.com>2015-02-23 15:28:04 -0800
committerGravatar Nicolas Noble <nnoble@google.com>2015-02-23 15:38:52 -0800
commit65b0759653bf36e6ed71e61f57796b85ab6f5ac9 (patch)
treefdf9241644f6686f6836219fa59c731574471b54 /src/core/support/time.c
parent74ae8f61d9cbc51d532b6ad98185094c1912a624 (diff)
Addressing a first batch of feedback.
Diffstat (limited to 'src/core/support/time.c')
-rw-r--r--src/core/support/time.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/support/time.c b/src/core/support/time.c
index 67f7665650..7dbf95059f 100644
--- a/src/core/support/time.c
+++ b/src/core/support/time.c
@@ -85,12 +85,12 @@ gpr_timespec gpr_time_from_nanos(long ns) {
} else if (ns == LONG_MIN) {
result = gpr_inf_past;
} else if (ns >= 0) {
- result.tv_sec = ns / 1000000000;
- result.tv_nsec = ns - result.tv_sec * 1000000000;
+ result.tv_sec = ns / GPR_NS_PER_SEC;
+ result.tv_nsec = ns - result.tv_sec * GPR_NS_PER_SEC;
} else {
/* Calculation carefully formulated to avoid any possible under/overflow. */
- result.tv_sec = (-(999999999 - (ns + 1000000000)) / 1000000000) - 1;
- result.tv_nsec = ns - result.tv_sec * 1000000000;
+ result.tv_sec = (-(999999999 - (ns + GPR_NS_PER_SEC)) / GPR_NS_PER_SEC) - 1;
+ result.tv_nsec = ns - result.tv_sec * GPR_NS_PER_SEC;
}
return result;
}
@@ -172,8 +172,8 @@ gpr_timespec gpr_time_add(gpr_timespec a, gpr_timespec b) {
gpr_timespec sum;
int inc = 0;
sum.tv_nsec = a.tv_nsec + b.tv_nsec;
- if (sum.tv_nsec >= 1000000000) {
- sum.tv_nsec -= 1000000000;
+ if (sum.tv_nsec >= GPR_NS_PER_SEC) {
+ sum.tv_nsec -= GPR_NS_PER_SEC;
inc++;
}
if (a.tv_sec == TYPE_MAX(time_t) || a.tv_sec == TYPE_MIN(time_t)) {
@@ -200,7 +200,7 @@ gpr_timespec gpr_time_sub(gpr_timespec a, gpr_timespec b) {
int dec = 0;
diff.tv_nsec = a.tv_nsec - b.tv_nsec;
if (diff.tv_nsec < 0) {
- diff.tv_nsec += 1000000000;
+ diff.tv_nsec += GPR_NS_PER_SEC;
dec++;
}
if (a.tv_sec == TYPE_MAX(time_t) || a.tv_sec == TYPE_MIN(time_t)) {