summaryrefslogtreecommitdiff
path: root/src/common/buffers.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-06 15:43:50 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-06 15:43:50 -0500
commit5f518c69aa634ee3487c2d8b40d2b4b0c3317f52 (patch)
tree9dba63fe2ade29c8506ecdfdd09a73b3e33a348a /src/common/buffers.c
parentc470a6d278c6340c2e2d10cac0796e6041b88dee (diff)
parent9c37e8c8d14a86d9cbbc6b203f4883c934391a3b (diff)
downloadtor-5f518c69aa634ee3487c2d8b40d2b4b0c3317f52.tar.gz
tor-5f518c69aa634ee3487c2d8b40d2b4b0c3317f52.zip
Merge remote-tracking branch 'public/monotime_coarse_stamps'
Diffstat (limited to 'src/common/buffers.c')
-rw-r--r--src/common/buffers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/buffers.c b/src/common/buffers.c
index a21cf2ab5b..e5d3664638 100644
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -472,7 +472,7 @@ buf_add_chunk_with_capacity(buf_t *buf, size_t capacity, int capped)
chunk = chunk_new_with_alloc_size(buf_preferred_chunk_size(capacity));
}
- chunk->inserted_time = (uint32_t)monotime_coarse_absolute_msec();
+ chunk->inserted_time = monotime_coarse_get_stamp();
if (buf->tail) {
tor_assert(buf->head);
@@ -487,8 +487,8 @@ buf_add_chunk_with_capacity(buf_t *buf, size_t capacity, int capped)
}
/** Return the age of the oldest chunk in the buffer <b>buf</b>, in
- * milliseconds. Requires the current monotonic time, in truncated msec,
- * as its input <b>now</b>.
+ * timestamp units. Requires the current monotonic timestamp as its
+ * input <b>now</b>.
*/
uint32_t
buf_get_oldest_chunk_timestamp(const buf_t *buf, uint32_t now)