mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: wait for timerd to avoid race on startup

Browse Source
This commit is contained in:
Stefan Seyfried
2012-11-03 21:26:35 +01:00
parent fa9f7f92ec
commit 84609f22ab
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/neutrino.cpp
View File

@@ -1734,7 +1734,7 @@ void CNeutrinoApp::InitSectiondClient()
#include <coolstream/cs_vfd.h> #include <coolstream/cs_vfd.h>
#endif #endif
void wake_up( bool &wakeup) void wake_up(long &wakeup)
{ {
#if HAVE_COOL_HARDWARE #if HAVE_COOL_HARDWARE
#ifndef FP_IOCTL_CLEAR_WAKEUP_TIMER #ifndef FP_IOCTL_CLEAR_WAKEUP_TIMER
@@ -1759,7 +1759,7 @@ void wake_up( bool &wakeup)
#endif #endif
/* not platform specific - this is created by the init process */ /* not platform specific - this is created by the init process */
if (access("/tmp/.timer_wakeup", F_OK) == 0) { if (access("/tmp/.timer_wakeup", F_OK) == 0) {
wakeup = true; wakeup = 1;
unlink("/tmp/.timer_wakeup"); unlink("/tmp/.timer_wakeup");
} }
@@ -1852,9 +1852,8 @@ fprintf(stderr, "[neutrino start] %d -> %5ld ms\n", __LINE__, time_monotonic_ms
g_Zapit->setStandby(false); g_Zapit->setStandby(false);
//timer start //timer start
bool timer_wakeup = false; long timer_wakeup = 0;
wake_up( timer_wakeup ); wake_up( timer_wakeup );
pthread_create (&timer_thread, NULL, timerd_main_thread, (void *) timer_wakeup);
init_cec_setting = true; init_cec_setting = true;
if(!(g_settings.shutdown_timer_record_type && timer_wakeup && g_settings.hdmi_cec_mode)){ if(!(g_settings.shutdown_timer_record_type && timer_wakeup && g_settings.hdmi_cec_mode)){
@@ -1864,7 +1863,8 @@ fprintf(stderr, "[neutrino start] %d -> %5ld ms\n", __LINE__, time_monotonic_ms
init_cec_setting = false; init_cec_setting = false;
} }
g_settings.shutdown_timer_record_type = false; g_settings.shutdown_timer_record_type = false;
timer_wakeup = false; pthread_create (&timer_thread, NULL, timerd_main_thread, (void *)&timer_wakeup);
// timer_wakeup = false;
powerManager = new cPowerManager; powerManager = new cPowerManager;
powerManager->Open(); powerManager->Open();
@@ -1954,6 +1954,11 @@ fprintf(stderr, "[neutrino start] %d -> %5ld ms\n", __LINE__, time_monotonic_ms
InitSectiondClient(); InitSectiondClient();
#endif #endif
/* wait until timerd is ready... */
time_t timerd_wait = time_monotonic_ms();
while (timer_wakeup >= 0)
usleep(100);
dprintf(DEBUG_NORMAL, "had to wait %ld ms for timerd start...\n", time_monotonic_ms() - timerd_wait);
InitTimerdClient(); InitTimerdClient();
g_volume = CVolume::getInstance(); g_volume = CVolume::getInstance();

8
src/timerd/timerd.cpp
View File

@@ -469,12 +469,16 @@ int timerd_main_thread(void *data)
CBasicServer timerd_server; CBasicServer timerd_server;
if (!timerd_server.prepare(TIMERD_UDS_NAME)) if (!timerd_server.prepare(TIMERD_UDS_NAME)) {
*(long *)data = -2; /* signal neutrino that waiting is pointless */
return -1; return -1;
}
// Start timer thread // Start timer thread
CTimerManager::getInstance(); CTimerManager::getInstance();
CTimerManager::getInstance()->wakeup =(bool)data; CTimerManager::getInstance()->wakeup = !!(*(long *)data);
*(long *)data = -1; /* signal we're up and running */
timerd_server.run(timerd_parse_command, CTimerdMsg::ACTVERSION); timerd_server.run(timerd_parse_command, CTimerdMsg::ACTVERSION);
printf("timerd shutdown complete\n"); printf("timerd shutdown complete\n");