empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename play_lock back to update_lock

Browse source 
It was renamed to play_lock because it synchronized not just updates
but also shutdown.  Since the previous commit, it again only
synchronizes updates.  Rename it back.

Also move its initialization next to shutdown_lock's.
This commit is contained in:
Markus Armbruster 2012-03-27 20:06:35 +02:00
parent 49ae6a7b9d
commit 2503e41bd2
4 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server/update.c
View file

@ -74,10 +74,6 @@ update_init(void)
if (update_get_schedule() < 0)
exit(1);
play_lock = empth_rwlock_create("Update");
if (!play_lock)
exit_nomem();
dp = player_new(-1);
if (!dp)
exit_nomem();
@ -207,17 +203,17 @@ update_run(void)
empth_wakeup(p->proc);
}
}
empth_rwlock_wrlock(play_lock);
empth_rwlock_wrlock(update_lock);
if (*pre_update_hook) {
if (run_hook(pre_update_hook, "pre-update")) {
empth_rwlock_unlock(play_lock);
empth_rwlock_unlock(update_lock);
return;
}
}
update_running = 1;
update_main();
update_running = 0;
empth_rwlock_unlock(play_lock);
empth_rwlock_unlock(update_lock);
}
int