diff options
| author | Greg Hudson <ghudson@mit.edu> | 2014-01-23 11:34:52 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2014-02-20 15:55:49 -0500 |
| commit | 71d028f1054deb186807e7c8048218b82b478422 (patch) | |
| tree | 72ab9b66b33ee7696f6662fccc50f2888ceadfbd /src/include | |
| parent | d1f9aa3737b2b3e62b5c5ed488d6112b7ce8a5ad (diff) | |
| download | krb5-71d028f1054deb186807e7c8048218b82b478422.zip krb5-71d028f1054deb186807e7c8048218b82b478422.tar.gz krb5-71d028f1054deb186807e7c8048218b82b478422.tar.bz2 | |
Lock around more ulog operations
Always lock the ulog when accessing it. We can currently get away
with some laxness on iprop slaves because they are mostly synchronous,
but hierarchical iprop will allow master and slave operations to take
place concurrently, requiring more strict locking.
Add new functions ulog_get_last and ulog_set_last, which access the
ulog header with locking, and use them in kdb5_util and kpropd. Add
locking to ulog_replay and ulog_init_header.
ulog_lock and ulog_sync_header are no longer used outside of kdb_log.c
after these changes, so make them static functions and remove the
ulog_ prefix. Add an unlock_ulog function for clarity.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/kdb_log.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/include/kdb_log.h b/src/include/kdb_log.h index 35b9d55..7f35eb7 100644 --- a/src/include/kdb_log.h +++ b/src/include/kdb_log.h @@ -69,7 +69,7 @@ extern "C" { */ krb5_error_code ulog_map(krb5_context context, const char *logname, uint32_t entries, int caller, char **db_args); -void ulog_init_header(krb5_context context); +krb5_error_code ulog_init_header(krb5_context context); krb5_error_code ulog_add_update(krb5_context context, kdb_incr_update_t *upd); krb5_error_code ulog_get_entries(krb5_context context, const kdb_last_t *last, kdb_incr_result_t *ulog_handle); @@ -81,9 +81,10 @@ krb5_error_code ulog_conv_2dbentry(krb5_context context, krb5_db_entry **entry, kdb_incr_update_t *update); void ulog_free_entries(kdb_incr_update_t *updates, int no_of_updates); krb5_error_code ulog_set_role(krb5_context ctx, iprop_role role); -krb5_error_code ulog_lock(krb5_context ctx, int mode); update_status_t ulog_get_sno_status(krb5_context context, const kdb_last_t *last); +krb5_error_code ulog_get_last(krb5_context context, kdb_last_t *last_out); +krb5_error_code ulog_set_last(krb5_context context, const kdb_last_t *last); typedef struct kdb_hlog { uint32_t kdb_hmagic; /* Log header magic # */ @@ -97,8 +98,6 @@ typedef struct kdb_hlog { uint16_t kdb_block; /* Block size of each element */ } kdb_hlog_t; -void ulog_sync_header(kdb_hlog_t *); - typedef struct kdb_ent_header { uint32_t kdb_umagic; /* Update entry magic # */ kdb_sno_t kdb_entry_sno; /* Serial # of entry */ |