#include "gnunet_statistics_service.h"
#include "gnunet_datacache_plugin.h"
-#define DEBUG_DATACACHE GNUNET_EXTRA_LOGGING
#define LOG(kind,...) GNUNET_log_from (kind, "datacache", __VA_ARGS__)
+#define LOG_STRERROR_FILE(kind,op,fn) GNUNET_log_from_strerror_file (kind, "datacache", op, fn)
+
/**
* Internal state of the datacache library.
*/
* @param size number of bytes that were made available
*/
static void
-env_delete_notify (void *cls, const GNUNET_HashCode * key, size_t size)
+env_delete_notify (void *cls, const struct GNUNET_HashCode * key, size_t size)
{
struct GNUNET_DATACACHE_Handle *h = cls;
-#if DEBUG_DATACACHE
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Content under key `%s' discarded\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Content under key `%s' discarded\n",
GNUNET_h2s (key));
-#endif
GNUNET_assert (h->utilization >= size);
h->utilization -= size;
GNUNET_CONTAINER_bloomfilter_remove (h->filter, key);
char *name;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg, section, "QUOTA", "a))
+ GNUNET_CONFIGURATION_get_value_size (cfg, section, "QUOTA", "a))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
_("No `%s' specified for `%s' in configuration!\n"), "QUOTA", section);
ret->filter = GNUNET_CONTAINER_bloomfilter_load (ret->bloom_name, quota / 1024, /* 8 bit per entry in DB, expect 1k entries */
5);
}
- else
+ if (NULL == ret->filter)
{
ret->filter = GNUNET_CONTAINER_bloomfilter_init (NULL, bf_size, 5); /* approx. 3% false positives at max use */
}
+ if (NULL == ret->filter)
+ {
+ GNUNET_free (name);
+ GNUNET_free (ret->bloom_name);
+ GNUNET_free (ret);
+ return NULL;
+ }
ret->stats = GNUNET_STATISTICS_create ("datacache", cfg);
ret->section = GNUNET_strdup (section);
ret->env.cfg = cfg;
*/
int
GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
- const GNUNET_HashCode * key, size_t size,
+ const struct GNUNET_HashCode * key, size_t size,
const char *data, enum GNUNET_BLOCK_Type type,
struct GNUNET_TIME_Absolute discard_time)
{
uint32_t used;
-
used = h->api->put (h->api->cls, key, size, data, type, discard_time);
if (used == 0)
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
-#if DEBUG_DATACACHE
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Stored data under key `%s' in cache\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Stored data under key `%s' in cache\n",
GNUNET_h2s (key));
-#endif
GNUNET_STATISTICS_update (h->stats, gettext_noop ("# bytes stored"), size,
GNUNET_NO);
GNUNET_CONTAINER_bloomfilter_add (h->filter, key);
*/
unsigned int
GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h,
- const GNUNET_HashCode * key, enum GNUNET_BLOCK_Type type,
+ const struct GNUNET_HashCode * key, enum GNUNET_BLOCK_Type type,
GNUNET_DATACACHE_Iterator iter, void *iter_cls)
{
GNUNET_STATISTICS_update (h->stats, gettext_noop ("# requests received"), 1,
GNUNET_NO);
-#if DEBUG_DATACACHE
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing request for key `%s'\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing request for key `%s'\n",
GNUNET_h2s (key));
-#endif
if (GNUNET_OK != GNUNET_CONTAINER_bloomfilter_test (h->filter, key))
{
GNUNET_STATISTICS_update (h->stats,
gettext_noop
("# requests filtered by bloom filter"), 1,
GNUNET_NO);
-#if DEBUG_DATACACHE
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Bloomfilter filters request for key `%s'\n",
- GNUNET_h2s (key));
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Bloomfilter filters request for key `%s'\n",
+ GNUNET_h2s (key));
return 0; /* can not be present */
}
return h->api->get (h->api->cls, key, type, iter, iter_cls);