sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

s3:dbwrap_watch: use backend.{rec,initial_value} instead of subrec[_value]

Browse Source 
This makes it much clearer to me what it actually is.

Keeping the initial_value with struct db_watched_record will also
simplify further changes.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Stefan Metzmacher 2022-06-24 11:16:37 +00:00 committed by Ralph Boehme
parent cb012e45c9
commit b3f6668f93
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
source3/lib/dbwrap/dbwrap_watch.c
View File

@ -140,7 +140,10 @@ struct db_watched_ctx {
struct db_watched_record { struct db_watched_record {
struct db_record *rec; struct db_record *rec;
struct db_record *subrec; struct {
struct db_record *rec;
TDB_DATA initial_value;
} backend;
struct dbwrap_watcher added; struct dbwrap_watcher added;
/* /*
@ -178,7 +181,6 @@ static struct db_record *dbwrap_watched_fetch_locked(
db->private_data, struct db_watched_ctx); db->private_data, struct db_watched_ctx);
struct db_record *rec; struct db_record *rec;
struct db_watched_record *wrec; struct db_watched_record *wrec;
TDB_DATA subrec_value;
bool ok; bool ok;
rec = talloc_zero(mem_ctx, struct db_record); rec = talloc_zero(mem_ctx, struct db_record);
@ -194,22 +196,24 @@ static struct db_record *dbwrap_watched_fetch_locked(
rec->private_data = wrec; rec->private_data = wrec;
wrec->rec = rec; wrec->rec = rec;
wrec->subrec = dbwrap_fetch_locked(ctx->backend, wrec, key); wrec->backend.rec = dbwrap_fetch_locked(ctx->backend, wrec, key);
if (wrec->subrec == NULL) { if (wrec->backend.rec == NULL) {
TALLOC_FREE(rec); TALLOC_FREE(rec);
return NULL; return NULL;
} }
wrec->backend.initial_value = dbwrap_record_get_value(wrec->backend.rec);
rec->db = db; rec->db = db;
rec->key = dbwrap_record_get_key(wrec->subrec); rec->key = dbwrap_record_get_key(wrec->backend.rec);
rec->storev = dbwrap_watched_storev; rec->storev = dbwrap_watched_storev;
rec->delete_rec = dbwrap_watched_delete; rec->delete_rec = dbwrap_watched_delete;
subrec_value = dbwrap_record_get_value(wrec->subrec); ok = dbwrap_watch_rec_parse(wrec->backend.initial_value,
NULL, NULL,
ok = dbwrap_watch_rec_parse(subrec_value, NULL, NULL, &rec->value); &rec->value);
if (!ok) { if (!ok) {
dbwrap_watch_log_invalid_record(db, rec->key, subrec_value); dbwrap_watch_log_invalid_record(db, rec->key,
wrec->backend.initial_value);
/* wipe invalid data */ /* wipe invalid data */
rec->value = (TDB_DATA) { .dptr = NULL, .dsize = 0 }; rec->value = (TDB_DATA) { .dptr = NULL, .dsize = 0 };
} }
@ -281,8 +285,8 @@ static void dbwrap_watched_add_watcher(
static int db_watched_record_destructor(struct db_watched_record *wrec) static int db_watched_record_destructor(struct db_watched_record *wrec)
{ {
struct dbwrap_watched_add_watcher_state state = { .w = wrec->added }; struct dbwrap_watched_add_watcher_state state = { .w = wrec->added };
struct db_context *backend = dbwrap_record_get_db(wrec->subrec); struct db_context *backend = dbwrap_record_get_db(wrec->backend.rec);
TDB_DATA key = dbwrap_record_get_key(wrec->subrec); TDB_DATA key = dbwrap_record_get_key(wrec->backend.rec);
NTSTATUS status; NTSTATUS status;
if (wrec->added.pid.pid == 0) { if (wrec->added.pid.pid == 0) {
@ -368,8 +372,8 @@ static NTSTATUS dbwrap_watched_do_locked_delete(struct db_record *rec)
} }
static void dbwrap_watched_do_locked_fn( static void dbwrap_watched_do_locked_fn(
struct db_record *subrec, struct db_record *backend_rec,
TDB_DATA subrec_value, TDB_DATA backend_value,
void *private_data) void *private_data)
{ {
struct dbwrap_watched_do_locked_state *state = struct dbwrap_watched_do_locked_state *state =
@ -377,7 +381,7 @@ static void dbwrap_watched_do_locked_fn(
struct db_watched_record wrec; struct db_watched_record wrec;
struct db_record rec = { struct db_record rec = {
.db = state->db, .db = state->db,
.key = dbwrap_record_get_key(subrec), .key = dbwrap_record_get_key(backend_rec),
.value_valid = false, .value_valid = false,
.storev = dbwrap_watched_do_locked_storev, .storev = dbwrap_watched_do_locked_storev,
.delete_rec = dbwrap_watched_do_locked_delete, .delete_rec = dbwrap_watched_do_locked_delete,
@ -387,15 +391,18 @@ static void dbwrap_watched_do_locked_fn(
wrec = (struct db_watched_record) { wrec = (struct db_watched_record) {
.rec = &rec, .rec = &rec,
.subrec = subrec, .backend = {
.wakeup_value = subrec_value, .rec = backend_rec,
.initial_value = backend_value,
},
.wakeup_value = backend_value,
}; };
ok = dbwrap_watch_rec_parse(subrec_value, ok = dbwrap_watch_rec_parse(backend_value,
NULL, NULL, NULL, NULL,
&rec.value); &rec.value);
if (!ok) { if (!ok) {
dbwrap_watch_log_invalid_record(rec.db, rec.key, subrec_value); dbwrap_watch_log_invalid_record(rec.db, rec.key, backend_value);
/* wipe invalid data */ /* wipe invalid data */
rec.value = (TDB_DATA) { .dptr = NULL, .dsize = 0 }; rec.value = (TDB_DATA) { .dptr = NULL, .dsize = 0 };
} }
@ -488,8 +495,8 @@ static void dbwrap_watched_record_wakeup(
struct db_watched_record *wrec) struct db_watched_record *wrec)
{ {
struct db_record *rec = wrec->rec; struct db_record *rec = wrec->rec;
struct db_context *backend = dbwrap_record_get_db(wrec->subrec); struct db_context *backend = dbwrap_record_get_db(wrec->backend.rec);
TDB_DATA key = dbwrap_record_get_key(wrec->subrec); TDB_DATA key = dbwrap_record_get_key(wrec->backend.rec);
struct db_context *db = dbwrap_record_get_db(rec); struct db_context *db = dbwrap_record_get_db(rec);
struct db_watched_ctx *ctx = talloc_get_type_abort( struct db_watched_ctx *ctx = talloc_get_type_abort(
db->private_data, struct db_watched_ctx); db->private_data, struct db_watched_ctx);
@ -539,7 +546,7 @@ static NTSTATUS dbwrap_watched_record_storev(
} }
status = dbwrap_record_storev( status = dbwrap_record_storev(
wrec->subrec, my_dbufs, ARRAY_SIZE(my_dbufs), flags); wrec->backend.rec, my_dbufs, ARRAY_SIZE(my_dbufs), flags);
return status; return status;
} }
@ -561,7 +568,7 @@ static NTSTATUS dbwrap_watched_record_delete(
/* /*
* Watchers were informed, we can throw away the record now * Watchers were informed, we can throw away the record now
*/ */
return dbwrap_record_delete(wrec->subrec); return dbwrap_record_delete(wrec->backend.rec);
} }
static NTSTATUS dbwrap_watched_delete(struct db_record *rec) static NTSTATUS dbwrap_watched_delete(struct db_record *rec)