ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-22 06:27:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better size arithmetic in Rhizome database cleanup code

Browse Source 
Fixes -Wsize-compare warnings
This commit is contained in:
Andrew Bettison 2013-12-10 17:24:14 +10:30
parent 8effa869a3
commit 608a705403
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rhizome_database.c
View File

@ -1208,7 +1208,9 @@ int rhizome_cleanup(struct rhizome_cleanup_report *report)
int rhizome_make_space(int group_priority, uint64_t bytes) int rhizome_make_space(int group_priority, uint64_t bytes)
{ {
/* Asked for impossibly large amount */ /* Asked for impossibly large amount */
if (bytes>=(config.rhizome.database_size-65536)) const size_t margin = 65536;
const uint64_t limit = config.rhizome.database_size > margin ? config.rhizome.database_size - margin : 1;
if (bytes >= limit)
return WHYF("bytes=%"PRIu64" is too large", bytes); return WHYF("bytes=%"PRIu64" is too large", bytes);
int64_t db_used = rhizome_database_used_bytes(); int64_t db_used = rhizome_database_used_bytes();
@ -1218,7 +1220,7 @@ int rhizome_make_space(int group_priority, uint64_t bytes)
rhizome_cleanup(NULL); rhizome_cleanup(NULL);
/* If there is already enough space now, then do nothing more */ /* If there is already enough space now, then do nothing more */
if (db_used<=(config.rhizome.database_size-bytes-65536)) if (db_used + bytes <= limit)
return 0; return 0;
/* Okay, not enough space, so free up some. */ /* Okay, not enough space, so free up some. */
@ -1228,7 +1230,7 @@ int rhizome_make_space(int group_priority, uint64_t bytes)
INT, group_priority, END); INT, group_priority, END);
if (!statement) if (!statement)
return -1; return -1;
while (bytes > (config.rhizome.database_size - 65536 - rhizome_database_used_bytes()) while (rhizome_database_used_bytes() + bytes > limit
&& sqlite_step_retry(&retry, statement) == SQLITE_ROW && sqlite_step_retry(&retry, statement) == SQLITE_ROW
) { ) {
/* Make sure we can drop this blob, and if so drop it, and recalculate number of bytes required */ /* Make sure we can drop this blob, and if so drop it, and recalculate number of bytes required */