nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move stub accessor functions a level higher, to consdiffmgr

Browse Source
This commit is contained in:
Nick Mathewson 2017-05-14 19:19:59 -04:00
parent ef2a62b2ff
commit 2f06345db3
4 changed files with 65 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/or/conscache.c
View File

@ -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>.

8
src/or/conscache.h
View File

@ -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);

51
src/or/consdiffmgr.c
View File

@ -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;
}

14
src/or/consdiffmgr.h
View File

@ -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);