Merge branch 'release-4.1' into contrib/update-tinydtls

This commit is contained in:
Simon Duquennoy 2018-05-04 21:03:04 +02:00 committed by GitHub
commit 08c52a1bcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -38,6 +38,7 @@
#define DB_OPTIONS_H
#include "contiki.h"
#include "cfs-coffee-arch.h"
/*----------------------------------------------------------------------------*/
@ -143,9 +144,17 @@
/* The default relation file size to reserve when using Coffee. */
#ifndef DB_COFFEE_RESERVE_SIZE
#define DB_COFFEE_RESERVE_SIZE (128 * 1024UL)
#define DB_COFFEE_RESERVE_SIZE (COFFEE_SIZE / 8)
#endif /* DB_COFFEE_RESERVE_SIZE */
/*
* Ensure that the default size of Coffee file reservations is suitable
* for the file system size.
*/
#if DB_COFFEE_RESERVE_SIZE > (COFFEE_SIZE / 2)
#error DB_COFFEE_RESERVE_SIZE is too large for the file system.
#endif
/* The maximum size of the physical storage of a tuple (labelled a "row"
in Antelope's terminology. */
#ifndef DB_MAX_CHAR_SIZE_PER_ROW