projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
890716e
)
housekeeping: time() is expensive. don't use it inside a mutex.
author
Wilfried Goesgens
<dothebart@citadel.org>
Tue, 5 Jun 2012 18:52:25 +0000
(20:52 +0200)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Tue, 5 Jun 2012 18:52:25 +0000
(20:52 +0200)
citadel/housekeeping.c
patch
|
blob
|
history
diff --git
a/citadel/housekeeping.c
b/citadel/housekeeping.c
index f4d930d64802631a320086be954b50f409255f58..6eb6440b7e54d7e0cb3bfa582780540f6c627ce6 100644
(file)
--- a/
citadel/housekeeping.c
+++ b/
citadel/housekeeping.c
@@
-117,9
+117,9
@@
void check_ref_counts(void) {
* only allow housekeeping to execute once per minute, and we only allow one
* instance to run at a time.
*/
* only allow housekeeping to execute once per minute, and we only allow one
* instance to run at a time.
*/
+static int housekeeping_in_progress = 0;
+static time_t last_timer = 0L;
void do_housekeeping(void) {
void do_housekeeping(void) {
- static int housekeeping_in_progress = 0;
- static time_t last_timer = 0L;
int do_housekeeping_now = 0;
int do_perminute_housekeeping_now = 0;
time_t now;
int do_housekeeping_now = 0;
int do_perminute_housekeeping_now = 0;
time_t now;
@@
-133,11
+133,6
@@
void do_housekeeping(void) {
if (housekeeping_in_progress == 0) {
do_housekeeping_now = 1;
housekeeping_in_progress = 1;
if (housekeeping_in_progress == 0) {
do_housekeeping_now = 1;
housekeeping_in_progress = 1;
- now = time(NULL);
- if ( (now - last_timer) > (time_t)60 ) {
- do_perminute_housekeeping_now = 1;
- last_timer = time(NULL);
- }
}
end_critical_section(S_HOUSEKEEPING);
}
end_critical_section(S_HOUSEKEEPING);
@@
-150,6
+145,12
@@
void do_housekeeping(void) {
* loop. Everything below this point is real work.
*/
* loop. Everything below this point is real work.
*/
+ now = time(NULL);
+ if ( (now - last_timer) > (time_t)60 ) {
+ do_perminute_housekeeping_now = 1;
+ last_timer = time(NULL);
+ }
+
/* First, do the "as often as needed" stuff... */
JournalRunQueue();
PerformSessionHooks(EVT_HOUSE);
/* First, do the "as often as needed" stuff... */
JournalRunQueue();
PerformSessionHooks(EVT_HOUSE);
@@
-163,5
+164,7
@@
void do_housekeeping(void) {
/*
* All done.
*/
/*
* All done.
*/
+ begin_critical_section(S_HOUSEKEEPING);
housekeeping_in_progress = 0;
housekeeping_in_progress = 0;
+ end_critical_section(S_HOUSEKEEPING);
}
}