Commit a60c9e772e2560a97c782a5dbe5269e6c5ad9d1f
2019-05-22T13:48:28
don't cache objects larger than 1MB
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125
diff --git a/lib/object_cache.c b/lib/object_cache.c
index bcfd6ab..4de69f1 100644
--- a/lib/object_cache.c
+++ b/lib/object_cache.c
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include <sha1.h>
#include <zlib.h>
@@ -32,10 +33,15 @@
#include "got_lib_object_idset.h"
#include "got_lib_object_cache.h"
+/*
+ * XXX This should be reworked to track cache size and usage in bytes,
+ * rather than tracking N elements capped to a maximum element size.
+ */
#define GOT_OBJECT_CACHE_SIZE_OBJ 256
#define GOT_OBJECT_CACHE_SIZE_TREE 256
#define GOT_OBJECT_CACHE_SIZE_COMMIT 64
#define GOT_OBJECT_CACHE_SIZE_TAG 32
+#define GOT_OBJECT_CACHE_MAX_ELEM_SIZE 1048576 /* 1 MB */
const struct got_error *
got_object_cache_init(struct got_object_cache *cache,
@@ -65,12 +71,96 @@ got_object_cache_init(struct got_object_cache *cache,
return NULL;
}
+size_t
+get_size_obj(struct got_object *obj)
+{
+ size_t size = sizeof(*obj);
+ struct got_delta *delta;
+
+ if (obj->flags & GOT_OBJ_FLAG_PACKED)
+ size += strlen(obj->path_packfile);
+
+ if ((obj->flags & GOT_OBJ_FLAG_DELTIFIED) == 0)
+ return size;
+
+ SIMPLEQ_FOREACH(delta, &obj->deltas.entries, entry) {
+ if (SIZE_MAX - (sizeof(*delta) + delta->delta_len) < size)
+ return SIZE_MAX;
+ size += sizeof(*delta) + delta->delta_len;
+ }
+
+ return size;
+}
+
+size_t
+get_size_tree(struct got_tree_object *tree)
+{
+ size_t size = sizeof(*tree);
+ struct got_tree_entry *te;
+
+ SIMPLEQ_FOREACH(te, &tree->entries.head, entry) {
+ size += sizeof(*te);
+ size += strlen(te->name);
+ size += sizeof(*te->id);
+ }
+
+ return size;
+}
+
+size_t
+get_size_commit(struct got_commit_object *commit)
+{
+ size_t size = sizeof(*commit);
+ struct got_object_qid *qid;
+
+ size += sizeof(*commit->tree_id);
+ size += strlen(commit->author);
+ size += strlen(commit->committer);
+ size += strlen(commit->logmsg);
+
+ SIMPLEQ_FOREACH(qid, &commit->parent_ids, entry)
+ size += sizeof(*qid) + sizeof(*qid->id);
+
+ return size;
+}
+
+size_t
+get_size_tag(struct got_tag_object *tag)
+{
+ size_t size = sizeof(*tag);
+
+ size += strlen(tag->tag);
+ size += strlen(tag->tagger);
+ size += strlen(tag->tagmsg);
+
+ return size;
+}
+
const struct got_error *
got_object_cache_add(struct got_object_cache *cache, struct got_object_id *id, void *item)
{
const struct got_error *err = NULL;
struct got_object_cache_entry *ce;
int nelem;
+ size_t size;
+
+ switch (cache->type) {
+ case GOT_OBJECT_CACHE_TYPE_OBJ:
+ size = get_size_obj((struct got_object *)item);
+ break;
+ case GOT_OBJECT_CACHE_TYPE_TREE:
+ size = get_size_tree((struct got_tree_object *)item);
+ break;
+ case GOT_OBJECT_CACHE_TYPE_COMMIT:
+ size = get_size_commit((struct got_commit_object *)item);
+ break;
+ case GOT_OBJECT_CACHE_TYPE_TAG:
+ size = get_size_tag((struct got_tag_object *)item);
+ break;
+ }
+
+ if (size > GOT_OBJECT_CACHE_MAX_ELEM_SIZE)
+ return NULL;
nelem = got_object_idset_num_elements(cache->idset);
if (nelem >= cache->size) {