From 1572944ecd70e2d3f716084a058218f3e90f241d Mon Sep 17 00:00:00 2001 From: Jasmin Jessich Date: Sun, 14 May 2017 00:52:37 +0200 Subject: Added comments concerning TODOs --- pages/schedule.ecpp | 3 +++ pages/timerconflicts.ecpp | 1 + pages/timers.ecpp | 1 + pages/whats_on.ecpp | 1 + 4 files changed, 6 insertions(+) (limited to 'pages') diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index be09d9d..96d9427 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -32,6 +32,9 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); pageTitle = trVDR("Schedule"); #if VDRVERSNUM >= 20301 + /* JJJ: Order wrong! Better get first the channel and with unlocked + * channels lock read the schedules + */ LOCK_SCHEDULES_READ; LOCK_CHANNELS_READ; #else diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp index 31f5607..b6c34f0 100644 --- a/pages/timerconflicts.ecpp +++ b/pages/timerconflicts.ecpp @@ -47,6 +47,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <%cpp> #if VDRVERSNUM >= 20301 + /* JJJ: Lock this later when it is realy used */ LOCK_TIMERS_READ; LOCK_SCHEDULES_READ; #endif diff --git a/pages/timers.ecpp b/pages/timers.ecpp index cc2eeb6..9f5632c 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -78,6 +78,7 @@ static const size_t maximumDescriptionLength = 300; <%cpp> // output of the timer list: #if VDRVERSNUM >= 20301 + /* JJJ: Lock this inside the loop */ LOCK_SCHEDULES_READ; #endif for (SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index a38faf9..2db13ef 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -39,6 +39,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); #if VDRVERSNUM >= 20301 +/* JJJ: Lock this later and in the right order */ LOCK_SCHEDULES_READ; #else cSchedulesLock schedulesLock; -- cgit v1.2.3