sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

merge from tridge

Browse Source 
(This used to be ctdb commit 190cca8488dff982062ae7b1a82cb33cc1cdfaf7)
This commit is contained in:
Ronnie Sahlberg 2007-05-10 06:55:28 +10:00
commit cbb6f99f41
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ctdb/common/ctdb_ltdb.c
View File

@ -440,8 +440,9 @@ static void ctdb_ltdb_seqnum_check(struct event_context *ev, struct timed_event
ctdb_db->seqnum = new_seqnum;
/* setup a new timer */
event_add_timed(ctdb->ev, ctdb_db, timeval_current_ofs(ctdb->seqnum_frequency, 0),
ctdb_ltdb_seqnum_check, ctdb_db);
ctdb_db->te = event_add_timed(ctdb->ev, ctdb_db,
timeval_current_ofs(ctdb->seqnum_frequency, 0),
ctdb_ltdb_seqnum_check, ctdb_db);
}
/*
@ -456,8 +457,11 @@ int32_t ctdb_ltdb_enable_seqnum(struct ctdb_context *ctdb, uint32_t db_id)
return -1;
}
event_add_timed(ctdb->ev, ctdb_db, timeval_current_ofs(ctdb->seqnum_frequency, 0),
ctdb_ltdb_seqnum_check, ctdb_db);
if (ctdb_db->te == NULL) {
ctdb_db->te = event_add_timed(ctdb->ev, ctdb_db,
timeval_current_ofs(ctdb->seqnum_frequency, 0),
ctdb_ltdb_seqnum_check, ctdb_db);
}
tdb_enable_seqnum(ctdb_db->ltdb->tdb);
ctdb_db->seqnum = tdb_get_seqnum(ctdb_db->ltdb->tdb);

1
ctdb/include/ctdb_private.h
View File

@ -246,6 +246,7 @@ struct ctdb_db_context {
struct tdb_wrap *ltdb;
struct ctdb_registered_call *calls; /* list of registered calls */
uint32_t seqnum;
struct timed_event *te;
};