f4ba41ebdd
[Code reviewed by Love Hörnquist Åstrand <lha@kth.se>] Added heim_db_*() entry points for dealing with databases, and make krb5_aname_to_localname() use it. The following enhancements to libheimbase are included: - Add heim_data_t and heim_string_t "reference" variants to avoid memory copies of potentially large data/strings. See heim_data_ref_create() and heim_string_ref_create(). - Added enhancements to heim_array_t to allow their use for queues and stacks, and to improve performance. See heim_array_insert_value(). - Added XPath-like accessors for heim_object_t. See heim_path_get(), heim_path_copy(), heim_path_create(), and heim_path_delete(). These are used extensively in the DB framework's generic composition of ACID support and in the test_base program - Made libheimbase more consistent with Core Foundation naming conventions. See heim_{dict, array}_{get, copy}_value() and heim_path_{get, copy}(). - Added functionality to and fixed bugs in base/json.c: - heim_serialize(); - depth limit for JSON parsing (for DoS protection); - pretty-printing; - JSON compliance (see below); - flag options for parsing and serializing; these are needed because of impedance mismatches between heim_object_t and JSON (e.g., heim_dict_t allows non-string keys, but JSON does not; heimbase supports binary data, while JSON does not). - Added heim_error_enomem(). - Enhanced the test_base program to test new functionality and to use heim_path*() to better test JSON encoding. This includes some fuzz testing of JSON parsing, and running the test under valgrind. - Started to add doxygen documentation for libheimbase (but doc build for libheimbase is still incomplete). Note that there's still some incomplete JSON support: - JSON string quoting is not fully implemented; - libheimbase lacks support for real numbers, while JSON has it -- otherwise libheimbase is a superset of JSON, specifically in that any heim_object_t can be a key for an associative array. The following DB backends are supported natively: - "sorted-text", a binary search of sorted (in C locale), flat text files; - "json", a backend that stores DB contents serialized as JSON (this is intended for configuration-like contents). The DB framework supports: - multiple key/value tables per-DB - ACID transactions The DB framework also natively implements ACID transactions for any DB backends that a) do not provide transactions natively, b) do provide lock/unlock/sync methods (even on Windows). This includes autocommit of DB updates outside transactions. Future DB enhancements may include: - add backends for various DB types (BDB, CDB, MDB, ...); - make libhdb use heim_db_t; - add a command-line tool for interfacing to databases via libheimbase (e.g., to get/set/delete values, create/copy/ backup DBs, inspect history, check integrity); - framework-level transaction logging (with redo and undo logging), for generic incremental replication; - framework-level DB integrity checking. We could store a MAC of the XOR of a hash function applied to {key, value} for every entry in the DB, then use this to check DB integrity incrementally during incremental replication, as well as for the whole DB.
148 lines
4.2 KiB
C
148 lines
4.2 KiB
C
/*
|
|
* Copyright (c) 2010 - 2011 Kungliga Tekniska Högskolan
|
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
|
* All rights reserved.
|
|
*
|
|
* Portions Copyright (c) 2010 Apple Inc. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* 3. Neither the name of the Institute nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
#include <sys/select.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#ifdef LIBINTL
|
|
#include <libintl.h>
|
|
#define N_(x,y) dgettext(HEIMDAL_TEXTDOMAIN, x)
|
|
#else
|
|
#define N_(x,y) (x)
|
|
#define bindtextdomain(package, localedir)
|
|
#endif
|
|
|
|
#include <roken.h>
|
|
|
|
#include "heimqueue.h"
|
|
#include "heim_threads.h"
|
|
#include "heimbase.h"
|
|
#include "heimbasepriv.h"
|
|
|
|
#ifdef HAVE_DISPATCH_DISPATCH_H
|
|
#include <dispatch/dispatch.h>
|
|
#endif
|
|
|
|
#if defined(__GNUC__) && defined(HAVE___SYNC_ADD_AND_FETCH)
|
|
|
|
#define heim_base_atomic_inc(x) __sync_add_and_fetch((x), 1)
|
|
#define heim_base_atomic_dec(x) __sync_sub_and_fetch((x), 1)
|
|
#define heim_base_atomic_type unsigned int
|
|
#define heim_base_atomic_max UINT_MAX
|
|
|
|
#ifndef __has_builtin
|
|
#define __has_builtin(x) 0
|
|
#endif
|
|
|
|
#if __has_builtin(__sync_swap)
|
|
#define heim_base_exchange_pointer(t,v) __sync_swap((t), (v))
|
|
#else
|
|
#define heim_base_exchange_pointer(t,v) __sync_lock_test_and_set((t), (v))
|
|
#endif
|
|
|
|
#elif defined(_WIN32)
|
|
|
|
#define heim_base_atomic_inc(x) InterlockedIncrement(x)
|
|
#define heim_base_atomic_dec(x) InterlockedDecrement(x)
|
|
#define heim_base_atomic_type LONG
|
|
#define heim_base_atomic_max MAXLONG
|
|
|
|
#define heim_base_exchange_pointer(t,v) InterlockedExchangePointer((t),(v))
|
|
|
|
#else
|
|
|
|
#define HEIM_BASE_NEED_ATOMIC_MUTEX 1
|
|
extern HEIMDAL_MUTEX _heim_base_mutex;
|
|
|
|
#define heim_base_atomic_type unsigned int
|
|
|
|
static inline heim_base_atomic_type
|
|
heim_base_atomic_inc(heim_base_atomic_type *x)
|
|
{
|
|
heim_base_atomic_type t;
|
|
HEIMDAL_MUTEX_lock(&_heim_base_mutex);
|
|
t = ++(*x);
|
|
HEIMDAL_MUTEX_unlock(&_heim_base_mutex);
|
|
return t;
|
|
}
|
|
|
|
static inline heim_base_atomic_type
|
|
heim_base_atomic_dec(heim_base_atomic_type *x)
|
|
{
|
|
heim_base_atomic_type t;
|
|
HEIMDAL_MUTEX_lock(&_heim_base_mutex);
|
|
t = --(*x);
|
|
HEIMDAL_MUTEX_unlock(&_heim_base_mutex);
|
|
return t;
|
|
}
|
|
|
|
#define heim_base_atomic_max UINT_MAX
|
|
|
|
#endif
|
|
|
|
/* tagged strings/object/XXX */
|
|
#define heim_base_is_tagged(x) (((uintptr_t)(x)) & 0x3)
|
|
|
|
#define heim_base_is_tagged_object(x) ((((uintptr_t)(x)) & 0x3) == 1)
|
|
#define heim_base_make_tagged_object(x, tid) \
|
|
((heim_object_t)((((uintptr_t)(x)) << 5) | ((tid) << 2) | 0x1))
|
|
#define heim_base_tagged_object_tid(x) ((((uintptr_t)(x)) & 0x1f) >> 2)
|
|
#define heim_base_tagged_object_value(x) (((uintptr_t)(x)) >> 5)
|
|
|
|
/*
|
|
*
|
|
*/
|
|
|
|
#undef HEIMDAL_NORETURN_ATTRIBUTE
|
|
#define HEIMDAL_NORETURN_ATTRIBUTE
|
|
#undef HEIMDAL_PRINTF_ATTRIBUTE
|
|
#define HEIMDAL_PRINTF_ATTRIBUTE(x)
|