[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Sun May 13 20:05:04 MDT 2012
The branch, master has been updated
via e945511 move the dbwrap library to the top level
via f5e5ed7 s3:build: move lib/dbwrap/dbwrap_util.o to the other dbwrap objects...
via e96a842 s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_tdb.c
via db7a8bf s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_rbt.c
via 7465484 s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_ctdb.c
via 03183e3 s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_file.c
via 05afaa8 s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_util.c
via 508a33f s3:dbwrap: move definition of dbwrap_lock_order to dbwrap.h
via 3583922 tevent: fix indentation in the wscript
from 8f887ce s3:smb2_sesssetup: make the top level code async using
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e945511aae52c0bc50007ffc703241c7da1db372
Author: Michael Adam <obnox at samba.org>
Date: Fri May 11 22:11:42 2012 +0200
move the dbwrap library to the top level
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Mon May 14 04:04:55 CEST 2012 on sn-devel-104
commit f5e5ed79ccc10e0b6aa50f6b6747d48d9505e7ee
Author: Michael Adam <obnox at samba.org>
Date: Mon May 14 01:52:09 2012 +0200
s3:build: move lib/dbwrap/dbwrap_util.o to the other dbwrap objects...
commit e96a84252766d40ff452d41b8ae7d4b67c4d677b
Author: Michael Adam <obnox at samba.org>
Date: Fri May 11 21:56:03 2012 +0200
s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_tdb.c
commit db7a8bf43c5732a59394ffb13bf057d2fdaf5b7d
Author: Michael Adam <obnox at samba.org>
Date: Fri May 11 21:54:46 2012 +0200
s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_rbt.c
commit 746548401fa53232b497439157f84c62ad00a575
Author: Michael Adam <obnox at samba.org>
Date: Fri May 11 21:53:13 2012 +0200
s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_ctdb.c
commit 03183e35848d4b691af58b45921938726147e956
Author: Michael Adam <obnox at samba.org>
Date: Fri May 11 21:49:40 2012 +0200
s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_file.c
commit 05afaa8361124f7d659d36856ec6253b62fb09a8
Author: Michael Adam <obnox at samba.org>
Date: Fri May 11 21:46:23 2012 +0200
s3:lib:dbwrap: use [u]int[num]_t consistently in dbwrap_util.c
commit 508a33fc2af8f2c1bcfe9aad5362cf3a9762c585
Author: Michael Adam <obnox at samba.org>
Date: Fri May 11 21:36:48 2012 +0200
s3:dbwrap: move definition of dbwrap_lock_order to dbwrap.h
This is needed in all of the library, not only in the dbwrap_open part.
commit 3583922c8277bf0ab9003953cb0a6ba27b7e7988
Author: Michael Adam <obnox at samba.org>
Date: Fri May 11 18:27:01 2012 +0200
tevent: fix indentation in the wscript
(accidentially commited in 5e8dee8d96a7522cdcde57dbbf93fbe9c614992e)
-----------------------------------------------------------------------
Summary of changes:
lib/dbwrap/dbwrap.c | 398 ++++++++++++++++++++
lib/dbwrap/dbwrap.h | 131 +++++++
{source3/lib => lib}/dbwrap/dbwrap_cache.c | 0
{source3/lib => lib}/dbwrap/dbwrap_cache.h | 0
lib/dbwrap/dbwrap_file.c | 418 +++++++++++++++++++++
{source3/lib => lib}/dbwrap/dbwrap_file.h | 0
lib/dbwrap/dbwrap_private.h | 70 ++++
lib/dbwrap/dbwrap_rbt.c | 450 +++++++++++++++++++++++
{source3/lib => lib}/dbwrap/dbwrap_rbt.h | 0
lib/dbwrap/dbwrap_tdb.c | 447 +++++++++++++++++++++++
{source3/lib => lib}/dbwrap/dbwrap_tdb.h | 0
lib/dbwrap/dbwrap_util.c | 539 ++++++++++++++++++++++++++++
lib/dbwrap/wscript_build | 11 +
lib/tevent/wscript | 2 +-
source3/Makefile.in | 11 +-
source3/lib/dbwrap/dbwrap.c | 398 --------------------
source3/lib/dbwrap/dbwrap.h | 125 -------
source3/lib/dbwrap/dbwrap_ctdb.c | 15 +-
source3/lib/dbwrap/dbwrap_file.c | 417 ---------------------
source3/lib/dbwrap/dbwrap_open.h | 6 -
source3/lib/dbwrap/dbwrap_private.h | 72 ----
source3/lib/dbwrap/dbwrap_rbt.c | 450 -----------------------
source3/lib/dbwrap/dbwrap_tdb.c | 447 -----------------------
source3/lib/dbwrap/dbwrap_util.c | 539 ----------------------------
source3/lib/dbwrap/dbwrap_watch.c | 2 +-
source3/lib/dbwrap/dbwrap_watch.h | 2 +-
source3/wscript_build | 5 -
source4/ntvfs/posix/python/pyxattr_tdb.c | 6 +-
wscript_build | 1 +
29 files changed, 2486 insertions(+), 2476 deletions(-)
create mode 100644 lib/dbwrap/dbwrap.c
create mode 100644 lib/dbwrap/dbwrap.h
rename {source3/lib => lib}/dbwrap/dbwrap_cache.c (100%)
rename {source3/lib => lib}/dbwrap/dbwrap_cache.h (100%)
create mode 100644 lib/dbwrap/dbwrap_file.c
rename {source3/lib => lib}/dbwrap/dbwrap_file.h (100%)
create mode 100644 lib/dbwrap/dbwrap_private.h
create mode 100644 lib/dbwrap/dbwrap_rbt.c
rename {source3/lib => lib}/dbwrap/dbwrap_rbt.h (100%)
create mode 100644 lib/dbwrap/dbwrap_tdb.c
rename {source3/lib => lib}/dbwrap/dbwrap_tdb.h (100%)
create mode 100644 lib/dbwrap/dbwrap_util.c
create mode 100644 lib/dbwrap/wscript_build
delete mode 100644 source3/lib/dbwrap/dbwrap.c
delete mode 100644 source3/lib/dbwrap/dbwrap.h
delete mode 100644 source3/lib/dbwrap/dbwrap_file.c
delete mode 100644 source3/lib/dbwrap/dbwrap_private.h
delete mode 100644 source3/lib/dbwrap/dbwrap_rbt.c
delete mode 100644 source3/lib/dbwrap/dbwrap_tdb.c
delete mode 100644 source3/lib/dbwrap/dbwrap_util.c
Changeset truncated at 500 lines:
diff --git a/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c
new file mode 100644
index 0000000..dbf10f7
--- /dev/null
+++ b/lib/dbwrap/dbwrap.c
@@ -0,0 +1,398 @@
+/*
+ Unix SMB/CIFS implementation.
+ Database interface wrapper
+ Copyright (C) Jim McDonough <jmcd at us.ibm.com> 2006
+
+ Major code contributions from Aleksey Fedoseev (fedoseev at ru.ibm.com)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_private.h"
+#include "lib/util/util_tdb.h"
+
+/*
+ * Fall back using fetch if no genuine exists operation is provided
+ */
+
+static int dbwrap_fallback_exists(struct db_context *db, TDB_DATA key)
+{
+ NTSTATUS status = dbwrap_parse_record(db, key, NULL, NULL);
+ return NT_STATUS_IS_OK(status) ? 1 : 0;
+}
+
+static int delete_record(struct db_record *rec, void *data)
+{
+ NTSTATUS status = dbwrap_record_delete(rec);
+ return NT_STATUS_IS_OK(status) ? 0 : -1;
+}
+
+/*
+ * Fallback wipe implementation using traverse and delete if no genuine
+ * wipe operation is provided
+ */
+static int dbwrap_fallback_wipe(struct db_context *db)
+{
+ NTSTATUS status = dbwrap_trans_traverse(db, delete_record, NULL);
+ return NT_STATUS_IS_OK(status) ? 0 : -1;
+}
+
+
+/*
+ * Wrapper functions for the backend methods
+ */
+
+TDB_DATA dbwrap_record_get_key(const struct db_record *rec)
+{
+ return rec->key;
+}
+
+TDB_DATA dbwrap_record_get_value(const struct db_record *rec)
+{
+ return rec->value;
+}
+
+NTSTATUS dbwrap_record_store(struct db_record *rec, TDB_DATA data, int flags)
+{
+ NTSTATUS status;
+ struct db_context *db;
+
+ status = rec->store(rec, data, flags);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+ db = rec->db;
+ if (db->stored_callback != NULL) {
+ db->stored_callback(db, rec,
+ db->stored_callback_private_data);
+ }
+ return NT_STATUS_OK;
+}
+
+void dbwrap_set_stored_callback(
+ struct db_context *db,
+ void (*cb)(struct db_context *db, struct db_record *rec,
+ void *private_data),
+ void *private_data)
+{
+ db->stored_callback = cb;
+ db->stored_callback_private_data = private_data;
+}
+
+NTSTATUS dbwrap_record_delete(struct db_record *rec)
+{
+ NTSTATUS status;
+ struct db_context *db;
+
+ status = rec->delete_rec(rec);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+ db = rec->db;
+ if (db->stored_callback != NULL) {
+ db->stored_callback(db, rec,
+ db->stored_callback_private_data);
+ }
+ return NT_STATUS_OK;
+}
+
+struct dbwrap_lock_order_state {
+ uint8_t *plock_order_mask;
+ uint8_t bitmask;
+};
+
+static int dbwrap_lock_order_state_destructor(
+ struct dbwrap_lock_order_state *s)
+{
+ *s->plock_order_mask &= ~s->bitmask;
+ return 0;
+}
+
+static struct dbwrap_lock_order_state *dbwrap_check_lock_order(
+ struct db_context *db, TALLOC_CTX *mem_ctx)
+{
+ /*
+ * Store the lock_order of currently locked records as bits in
+ * "lock_order_mask". We only use levels 1,2,3 right now, so a
+ * single uint8_t is enough.
+ */
+ static uint8_t lock_order_mask;
+
+ struct dbwrap_lock_order_state *state;
+ uint8_t idx;
+ int used;
+
+ if (db->lock_order == 0) {
+ /*
+ * lock order 0 is for example for dbwrap_rbt without
+ * real locking. Return state nevertheless to avoid
+ * special cases.
+ */
+ return talloc(mem_ctx, struct dbwrap_lock_order_state);
+ }
+
+ /*
+ * We fill bits from the high bits, to be able to use
+ * "ffs(lock_order_mask)"
+ */
+ idx = sizeof(lock_order_mask)*8 - db->lock_order;
+
+ used = ffs(lock_order_mask);
+
+ DEBUG(5, ("used=%d, lock_order=%d, idx=%d\n", used,
+ (int)db->lock_order, (int)idx));
+
+ if ((used != 0) && (used-1 <= idx)) {
+ DEBUG(0, ("Lock order violation: Trying %d, order_mask=%x\n",
+ (int)db->lock_order, (int)lock_order_mask));
+ return NULL;
+ }
+
+ state = talloc(mem_ctx, struct dbwrap_lock_order_state);
+ if (state == NULL) {
+ DEBUG(1, ("talloc failed\n"));
+ return NULL;
+ }
+ state->bitmask = 1 << idx;
+ state->plock_order_mask = &lock_order_mask;
+
+ talloc_set_destructor(state, dbwrap_lock_order_state_destructor);
+ lock_order_mask |= state->bitmask;
+
+ return state;
+}
+
+static struct db_record *dbwrap_fetch_locked_internal(
+ struct db_context *db, TALLOC_CTX *mem_ctx, TDB_DATA key,
+ struct db_record *(*db_fn)(struct db_context *db, TALLOC_CTX *mem_ctx,
+ TDB_DATA key))
+{
+ struct db_record *rec;
+ struct dbwrap_lock_order_state *lock_order;
+ TALLOC_CTX *frame = talloc_stackframe();
+
+ lock_order = dbwrap_check_lock_order(db, frame);
+ if (lock_order == NULL) {
+ TALLOC_FREE(frame);
+ return NULL;
+ }
+ rec = db_fn(db, mem_ctx, key);
+ if (rec == NULL) {
+ TALLOC_FREE(frame);
+ return NULL;
+ }
+ (void)talloc_steal(rec, lock_order);
+ rec->db = db;
+ TALLOC_FREE(frame);
+ return rec;
+}
+
+struct db_record *dbwrap_fetch_locked(struct db_context *db,
+ TALLOC_CTX *mem_ctx,
+ TDB_DATA key)
+{
+ return dbwrap_fetch_locked_internal(db, mem_ctx, key,
+ db->fetch_locked);
+}
+
+struct db_record *dbwrap_try_fetch_locked(struct db_context *db,
+ TALLOC_CTX *mem_ctx,
+ TDB_DATA key)
+{
+ return dbwrap_fetch_locked_internal(
+ db, mem_ctx, key,
+ db->try_fetch_locked
+ ? db->try_fetch_locked : db->fetch_locked);
+}
+
+struct db_context *dbwrap_record_get_db(struct db_record *rec)
+{
+ return rec->db;
+}
+
+struct dbwrap_fetch_state {
+ TALLOC_CTX *mem_ctx;
+ TDB_DATA data;
+};
+
+static void dbwrap_fetch_parser(TDB_DATA key, TDB_DATA data,
+ void *private_data)
+{
+ struct dbwrap_fetch_state *state =
+ (struct dbwrap_fetch_state *)private_data;
+
+ state->data.dsize = data.dsize;
+ state->data.dptr = (uint8_t *)talloc_memdup(state->mem_ctx, data.dptr,
+ data.dsize);
+}
+
+NTSTATUS dbwrap_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
+ TDB_DATA key, TDB_DATA *value)
+{
+ struct dbwrap_fetch_state state;
+ NTSTATUS status;
+
+ if (value == NULL) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ state.mem_ctx = mem_ctx;
+
+ status = dbwrap_parse_record(db, key, dbwrap_fetch_parser, &state);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+ if ((state.data.dsize != 0) && (state.data.dptr == NULL)) {
+ return NT_STATUS_NO_MEMORY;
+ }
+ *value = state.data;
+ return NT_STATUS_OK;
+}
+
+bool dbwrap_exists(struct db_context *db, TDB_DATA key)
+{
+ int result;
+ if (db->exists != NULL) {
+ result = db->exists(db, key);
+ } else {
+ result = dbwrap_fallback_exists(db,key);
+ }
+ return (result == 1);
+}
+
+NTSTATUS dbwrap_store(struct db_context *db, TDB_DATA key,
+ TDB_DATA data, int flags)
+{
+ struct db_record *rec;
+ NTSTATUS status;
+ TALLOC_CTX *frame = talloc_stackframe();
+
+ rec = dbwrap_fetch_locked(db, frame, key);
+ if (rec == NULL) {
+ TALLOC_FREE(frame);
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ status = dbwrap_record_store(rec, data, flags);
+ TALLOC_FREE(frame);
+ return status;
+}
+
+NTSTATUS dbwrap_delete(struct db_context *db, TDB_DATA key)
+{
+ struct db_record *rec;
+ NTSTATUS status;
+ TALLOC_CTX *frame = talloc_stackframe();
+
+ rec = dbwrap_fetch_locked(db, frame, key);
+ if (rec == NULL) {
+ TALLOC_FREE(frame);
+ return NT_STATUS_NO_MEMORY;
+ }
+ status = dbwrap_record_delete(rec);
+ TALLOC_FREE(frame);
+ return status;
+}
+
+NTSTATUS dbwrap_traverse(struct db_context *db,
+ int (*f)(struct db_record*, void*),
+ void *private_data,
+ int *count)
+{
+ int ret = db->traverse(db, f, private_data);
+
+ if (ret < 0) {
+ return NT_STATUS_INTERNAL_DB_CORRUPTION;
+ }
+
+ if (count != NULL) {
+ *count = ret;
+ }
+
+ return NT_STATUS_OK;
+}
+
+NTSTATUS dbwrap_traverse_read(struct db_context *db,
+ int (*f)(struct db_record*, void*),
+ void *private_data,
+ int *count)
+{
+ int ret = db->traverse_read(db, f, private_data);
+
+ if (ret < 0) {
+ return NT_STATUS_INTERNAL_DB_CORRUPTION;
+ }
+
+ if (count != NULL) {
+ *count = ret;
+ }
+
+ return NT_STATUS_OK;
+}
+
+static void dbwrap_null_parser(TDB_DATA key, TDB_DATA val, void* data)
+{
+ return;
+}
+
+NTSTATUS dbwrap_parse_record(struct db_context *db, TDB_DATA key,
+ void (*parser)(TDB_DATA key, TDB_DATA data,
+ void *private_data),
+ void *private_data)
+{
+ if (parser == NULL) {
+ parser = dbwrap_null_parser;
+ }
+ return db->parse_record(db, key, parser, private_data);
+}
+
+int dbwrap_wipe(struct db_context *db)
+{
+ if (db->wipe == NULL) {
+ return dbwrap_fallback_wipe(db);
+ }
+ return db->wipe(db);
+}
+
+int dbwrap_get_seqnum(struct db_context *db)
+{
+ return db->get_seqnum(db);
+}
+
+int dbwrap_get_flags(struct db_context *db)
+{
+ return db->get_flags(db);
+}
+
+int dbwrap_transaction_start(struct db_context *db)
+{
+ return db->transaction_start(db);
+}
+
+int dbwrap_transaction_commit(struct db_context *db)
+{
+ return db->transaction_commit(db);
+}
+
+int dbwrap_transaction_cancel(struct db_context *db)
+{
+ return db->transaction_cancel(db);
+}
+
+void dbwrap_db_id(struct db_context *db, const uint8_t **id, size_t *idlen)
+{
+ db->id(db, id, idlen);
+}
diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h
new file mode 100644
index 0000000..59e5af0
--- /dev/null
+++ b/lib/dbwrap/dbwrap.h
@@ -0,0 +1,131 @@
+/*
+ Unix SMB/CIFS implementation.
+ Database interface wrapper around tdb
+ Copyright (C) Volker Lendecke 2005-2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __DBWRAP_H__
+#define __DBWRAP_H__
+
+#include "tdb_compat.h"
+
+struct db_record;
+struct db_context;
+
+enum dbwrap_lock_order {
+ DBWRAP_LOCK_ORDER_1 = 1,
+ DBWRAP_LOCK_ORDER_2 = 2,
+ DBWRAP_LOCK_ORDER_3 = 3
+};
+
+/* The following definitions come from lib/dbwrap.c */
+
+TDB_DATA dbwrap_record_get_key(const struct db_record *rec);
+TDB_DATA dbwrap_record_get_value(const struct db_record *rec);
+NTSTATUS dbwrap_record_store(struct db_record *rec, TDB_DATA data, int flags);
+NTSTATUS dbwrap_record_delete(struct db_record *rec);
+struct db_record *dbwrap_fetch_locked(struct db_context *db,
+ TALLOC_CTX *mem_ctx,
+ TDB_DATA key);
+struct db_record *dbwrap_try_fetch_locked(struct db_context *db,
+ TALLOC_CTX *mem_ctx,
+ TDB_DATA key);
+struct db_context *dbwrap_record_get_db(struct db_record *rec);
+void dbwrap_set_stored_callback(
+ struct db_context *db,
+ void (*cb)(struct db_context *db, struct db_record *rec,
+ void *private_data),
+ void *private_data);
+
+NTSTATUS dbwrap_delete(struct db_context *db, TDB_DATA key);
+NTSTATUS dbwrap_store(struct db_context *db, TDB_DATA key,
+ TDB_DATA data, int flags);
+NTSTATUS dbwrap_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
+ TDB_DATA key, TDB_DATA *value);
+bool dbwrap_exists(struct db_context *db, TDB_DATA key);
+NTSTATUS dbwrap_traverse(struct db_context *db,
+ int (*f)(struct db_record*, void*),
+ void *private_data,
+ int *count);
+NTSTATUS dbwrap_traverse_read(struct db_context *db,
+ int (*f)(struct db_record*, void*),
+ void *private_data,
+ int *count);
+NTSTATUS dbwrap_parse_record(struct db_context *db, TDB_DATA key,
+ void (*parser)(TDB_DATA key, TDB_DATA data,
+ void *private_data),
+ void *private_data);
+int dbwrap_wipe(struct db_context *db);
+int dbwrap_get_seqnum(struct db_context *db);
+int dbwrap_get_flags(struct db_context *db);
+int dbwrap_transaction_start(struct db_context *db);
+int dbwrap_transaction_commit(struct db_context *db);
+int dbwrap_transaction_cancel(struct db_context *db);
+void dbwrap_db_id(struct db_context *db, const uint8_t **id, size_t *idlen);
+
+
+/* The following definitions come from lib/dbwrap_util.c */
+
+NTSTATUS dbwrap_delete_bystring(struct db_context *db, const char *key);
+NTSTATUS dbwrap_store_bystring(struct db_context *db, const char *key,
+ TDB_DATA data, int flags);
+NTSTATUS dbwrap_fetch_bystring(struct db_context *db, TALLOC_CTX *mem_ctx,
+ const char *key, TDB_DATA *value);
+
+NTSTATUS dbwrap_fetch_int32(struct db_context *db, const char *keystr,
+ int32_t *result);
+NTSTATUS dbwrap_store_int32(struct db_context *db, const char *keystr,
--
Samba Shared Repository
More information about the samba-cvs
mailing list