[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Move stub accessor functions a level higher, to consdiffmgr
commit 2f06345db3b6f85144c1d8a0b6ca55e2b1e243ce
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Sun May 14 19:19:59 2017 -0400
Move stub accessor functions a level higher, to consdiffmgr
---
src/or/conscache.c | 59 ----------------------------------------------------
src/or/conscache.h | 8 -------
src/or/consdiffmgr.c | 51 +++++++++++++++++++++++++++++++++++++++++++++
src/or/consdiffmgr.h | 14 +++++++++++++
4 files changed, 65 insertions(+), 67 deletions(-)
diff --git a/src/or/conscache.c b/src/or/conscache.c
index fd46cbe..5ffa129 100644
--- a/src/or/conscache.c
+++ b/src/or/conscache.c
@@ -374,65 +374,6 @@ consensus_cache_entry_get_body(const consensus_cache_entry_t *ent,
return 0;
}
-/** Read the lifetime of cached object <b>ent</b> into <b>lifetime</b>. */
-int consensus_cache_entry_get_lifetime(const consensus_cache_entry_t *ent,
- long *lifetime)
-{
- if (BUG(ent->magic != CCE_MAGIC))
- return -1; // LCOV_EXCL_LINE
-
- tor_assert(lifetime);
-
- // FIXME(ahf): Fill out.
- *lifetime = 0;
-
- return 0;
-}
-
-/** Return non-zero if the cache object found in <b>ent</b> is
- * reasonably live, otherwise return 0. Use <b>now</b> to pass the
- * timestamp used for comparison. */
-int consensus_cache_entry_is_reasonably_live(const consensus_cache_entry_t *ent,
- time_t now)
-{
- if (BUG(ent->magic != CCE_MAGIC))
- return -1; // LCOV_EXCL_LINE
-
- // FIXME(ahf): Fill out.
- (void)now;
-
- return 1;
-}
-
-/** Read the set of voters from the cached object <b>ent</b> into <b>out</b>. */
-int consensus_cache_entry_get_voters(const consensus_cache_entry_t *ent,
- smartlist_t *out)
-{
- if (BUG(ent->magic != CCE_MAGIC))
- return -1; // LCOV_EXCL_LINE
-
- // FIXME(ahf): Fill out.
- (void)out;
-
- return 0;
-}
-
-/** Read the valid until timestamp from the cached object <b>ent</b>
- * into <b>out</b>. */
-int consensus_cache_entry_valid_until(const consensus_cache_entry_t *ent,
- time_t *out)
-{
- if (BUG(ent->magic != CCE_MAGIC))
- return -1; // LCOV_EXCL_LINE
-
- tor_assert(out);
-
- // FIXME(ahf): Fill out.
- *out = time(NULL);
-
- return 0;
-}
-
/**
* Unmap every mmap'd element of <b>cache</b> that has been unused
* since <b>cutoff</b>.
diff --git a/src/or/conscache.h b/src/or/conscache.h
index fcc3f3e..aef5420 100644
--- a/src/or/conscache.h
+++ b/src/or/conscache.h
@@ -52,14 +52,6 @@ void consensus_cache_entry_mark_for_aggressive_release(
int consensus_cache_entry_get_body(const consensus_cache_entry_t *ent,
const uint8_t **body_out,
size_t *sz_out);
-int consensus_cache_entry_get_lifetime(const consensus_cache_entry_t *ent,
- long *lifetime);
-int consensus_cache_entry_is_reasonably_live(const consensus_cache_entry_t *ent,
- time_t now);
-int consensus_cache_entry_get_voters(const consensus_cache_entry_t *ent,
- smartlist_t *out);
-int consensus_cache_entry_valid_until(const consensus_cache_entry_t *ent,
- time_t *out);
#ifdef TOR_UNIT_TESTS
int consensus_cache_entry_is_mapped(consensus_cache_entry_t *ent);
diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c
index a2e2693..c208865 100644
--- a/src/or/consdiffmgr.c
+++ b/src/or/consdiffmgr.c
@@ -1729,3 +1729,54 @@ consdiffmgr_enable_background_compression(void)
background_compression = 1;
}
+/** Read the lifetime of cached object <b>ent</b> into <b>lifetime</b>. */
+int
+consensus_cache_entry_get_lifetime(const consensus_cache_entry_t *ent,
+ long *lifetime)
+{
+ tor_assert(lifetime);
+
+ // FIXME(ahf): Fill out.
+ *lifetime = 0;
+
+ return 0;
+}
+
+/** Return non-zero if the cache object found in <b>ent</b> is
+ * reasonably live, otherwise return 0. Use <b>now</b> to pass the
+ * timestamp used for comparison. */
+int
+consensus_cache_entry_is_reasonably_live(const consensus_cache_entry_t *ent,
+ time_t now)
+{
+ // FIXME(ahf): Fill out.
+ (void)now;
+
+ return 1;
+}
+
+/** Read the set of voters from the cached object <b>ent</b> into <b>out</b>. */
+int
+consensus_cache_entry_get_voters(const consensus_cache_entry_t *ent,
+ smartlist_t *out)
+{
+ // FIXME(ahf): Fill out.
+ (void)out;
+
+ return 0;
+}
+
+/** Read the valid until timestamp from the cached object <b>ent</b>
+ * into <b>out</b>. */
+int
+consensus_cache_entry_valid_until(const consensus_cache_entry_t *ent,
+ time_t *out)
+{
+ tor_assert(out);
+
+ // FIXME(ahf): Fill out.
+ *out = time(NULL);
+
+ return 0;
+}
+
diff --git a/src/or/consdiffmgr.h b/src/or/consdiffmgr.h
index abe1ea9..a8111dd 100644
--- a/src/or/consdiffmgr.h
+++ b/src/or/consdiffmgr.h
@@ -35,6 +35,20 @@ consdiff_status_t consdiffmgr_find_diff_from(
const uint8_t *digest,
size_t digestlen,
compress_method_t method);
+
+int consensus_cache_entry_get_lifetime(
+ const struct consensus_cache_entry_t *ent,
+ long *lifetime);
+int consensus_cache_entry_is_reasonably_live(
+ const struct consensus_cache_entry_t *ent,
+ time_t now);
+int consensus_cache_entry_get_voters(
+ const struct consensus_cache_entry_t *ent,
+ smartlist_t *out);
+int consensus_cache_entry_valid_until(
+ const struct consensus_cache_entry_t *ent,
+ time_t *out);
+
void consdiffmgr_rescan(void);
int consdiffmgr_cleanup(void);
void consdiffmgr_enable_background_compression(void);
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits