Browse Source

ckdb - workmarkers has 2 trees, fix so both are always updated

master
kanoi 10 years ago committed by Con Kolivas
parent
commit
bba8cc5a54
  1. 2
      src/ckdb.h
  2. 9
      src/ckdb_dbio.c

2
src/ckdb.h

@ -52,7 +52,7 @@
#define DB_VLOCK "1" #define DB_VLOCK "1"
#define DB_VERSION "0.9.6" #define DB_VERSION "0.9.6"
#define CKDB_VERSION DB_VERSION"-0.836" #define CKDB_VERSION DB_VERSION"-0.837"
#define WHERE_FFL " - from %s %s() line %d" #define WHERE_FFL " - from %s %s() line %d"
#define WHERE_FFL_HERE __FILE__, __func__, __LINE__ #define WHERE_FFL_HERE __FILE__, __func__, __LINE__

9
src/ckdb_dbio.c

@ -5978,15 +5978,24 @@ unparam:
workmarkers_root = remove_from_ktree(workmarkers_root, workmarkers_root = remove_from_ktree(workmarkers_root,
old_wm_item, old_wm_item,
cmp_workmarkers); cmp_workmarkers);
workmarkers_workinfoid_root = remove_from_ktree(workmarkers_workinfoid_root,
old_wm_item,
cmp_workmarkers_workinfoid);
copy_tv(&(oldworkmarkers->expirydate), cd); copy_tv(&(oldworkmarkers->expirydate), cd);
workmarkers_root = add_to_ktree(workmarkers_root, workmarkers_root = add_to_ktree(workmarkers_root,
old_wm_item, old_wm_item,
cmp_workmarkers); cmp_workmarkers);
workmarkers_workinfoid_root = add_to_ktree(workmarkers_workinfoid_root,
old_wm_item,
cmp_workmarkers_workinfoid);
} }
if (wm_item) { if (wm_item) {
workmarkers_root = add_to_ktree(workmarkers_root, workmarkers_root = add_to_ktree(workmarkers_root,
wm_item, wm_item,
cmp_workmarkers); cmp_workmarkers);
workmarkers_workinfoid_root = add_to_ktree(workmarkers_workinfoid_root,
wm_item,
cmp_workmarkers_workinfoid);
k_add_head(workmarkers_store, wm_item); k_add_head(workmarkers_store, wm_item);
} }
} }

Loading…
Cancel
Save