Ticket #363: time.patch

client/cs_prefs.C

@@ -130 +130 @@
-        if (!global_prefs.run_if_user_active && user_active) {
-            return SUSPEND_REASON_USER_ACTIVE;
-        }
-suspended_time_of_day(PREFS_CPU
+cpu_times.suspended(
-            return SUSPEND_REASON_TIME_OF_DAY;
-        }
-    }
@@ -223 +223 @@
-    if (!global_prefs.run_if_user_active && user_active) {
-        return SUSPEND_REASON_USER_ACTIVE;
-    }
-suspended_time_of_day(PREFS_NETWORK
+net_times.suspended(
-        return SUSPEND_REASON_TIME_OF_DAY;
-    }
-    return 0;

clientgui/DlgAdvPreferences.cpp

@@ -197 +197 @@
-
-        // ######### proc usage page
-        // do work between
-time_pref
-time_pref
+cpu_time
+cpu_time
-        //special day times
-        wxCheckBox* aChks[] = {m_chkProcSunday,m_chkProcMonday,m_chkProcTuesday,m_chkProcWednesday,m_chkProcThursday,m_chkProcFriday,m_chkProcSaturday};
-        wxTextCtrl* aTxts[] = {m_txtProcSunday,m_txtProcMonday,m_txtProcTuesday,m_txtProcWednesday,m_txtProcThursday,m_txtProcFriday,m_txtProcSaturday};
-        for(int i=0; i< 7;i++) {
-
-       prefs.week_prefs.days[i].time_prefs.start_hour != prefs.week_prefs.days[i].time_prefs.end_hour
-prefs.week_prefs.days[i].day_of_week
-prefs.week_prefs.days[i].time_prefs.
-prefs.week_prefs.days[i].time_prefs.
+
+if(cpu
+i
+cpu->
+cpu->
-                        aTxts[i]->SetValue(timeStr);
-                }
-        }
@@ -231 +231 @@
-
-        // ######### net usage page
-        // use network between
-time_prefs.net_
-time_prefs.net_
+net_times.
+net_times.
-        //special day times
-        wxCheckBox* aChks2[] = {m_chkNetSunday,m_chkNetMonday,m_chkNetTuesday,m_chkNetWednesday,m_chkNetThursday,m_chkNetFriday,m_chkNetSaturday};
-        wxTextCtrl* aTxts2[] = {m_txtNetSunday,m_txtNetMonday,m_txtNetTuesday,m_txtNetWednesday,m_txtNetThursday,m_txtNetFriday,m_txtNetSaturday};
-        for(int i=0; i< 7;i++) {
-
-       prefs.week_prefs.days[i].time_prefs.net_start_hour != prefs.week_prefs.days[i].time_prefs.net_end_hour
-prefs.week_prefs.days[i].day_of_week
-prefs.week_prefs.days[i].time_prefs.net_
-prefs.week_prefs.days[i].time_prefs.net_
+
+if(net
+i
+net->
+net->
-                        aTxts2[i]->SetValue(timeStr);
-                }
-        }
@@ -300 +300 @@
-
-        mask.clear();
-        //clear special times settings
-
-
-
-
-
+
+
-        //proc page
-        prefs.run_on_batteries=m_chkProcOnBatteries->GetValue();
-        mask.run_on_batteries=true;
@@ -318 +315 @@
-                mask.idle_time_to_run=true;
-        }
-        //
-time_pref
+cpu_time
-        mask.start_hour = true;        
-        //
-time_pref
+cpu_time
-        mask.end_hour = true;        
-        //
-        wxCheckBox* aChks[] = {m_chkProcSunday,m_chkProcMonday,m_chkProcTuesday,m_chkProcWednesday,m_chkProcThursday,m_chkProcFriday,m_chkProcSaturday};
-        wxTextCtrl* aTxts[] = {m_txtProcSunday,m_txtProcMonday,m_txtProcTuesday,m_txtProcWednesday,m_txtProcThursday,m_txtProcFriday,m_txtProcSaturday};
-        for(int i=0; i< 7;i++) {
-                if(aChks[i]->GetValue()) {
-                        prefs.week_prefs.present=true;
-                        prefs.week_prefs.days[i].day_of_week =i;
-                        prefs.week_prefs.days[i].present =true;
-                        wxString timeStr = aTxts[i]->GetValue();
-                        wxString startStr = timeStr.SubString(0,timeStr.First('-'));
-                        wxString endStr = timeStr.SubString(timeStr.First('-')+1,timeStr.Length());
-
-
+
+
+
+
-                }
-        }
-        m_txtProcSwitchEvery->GetValue().ToDouble(&td);
@@ -377 +373 @@
-        prefs.work_buf_additional_days = td;
-        mask.work_buf_additional_days = true;
-        //
-time_prefs.net_
+net_times.
-        mask.net_start_hour = true;        
-        //
-time_prefs.net_
+net_times.
-        mask.net_end_hour = true;        
-                
-        wxCheckBox* aChks2[] = {m_chkNetSunday,m_chkNetMonday,m_chkNetTuesday,m_chkNetWednesday,m_chkNetThursday,m_chkNetFriday,m_chkNetSaturday};
-        wxTextCtrl* aTxts2[] = {m_txtNetSunday,m_txtNetMonday,m_txtNetTuesday,m_txtNetWednesday,m_txtNetThursday,m_txtNetFriday,m_txtNetSaturday};
-        for(int i=0; i< 7;i++) {
-                if(aChks2[i]->GetValue()) {
-                        prefs.week_prefs.present=true;
-                        prefs.week_prefs.days[i].day_of_week =i;
-                        prefs.week_prefs.days[i].present =true;
-                        wxString timeStr = aTxts2[i]->GetValue();
-                        wxString startStr = timeStr.SubString(0,timeStr.First('-'));
-                        wxString endStr = timeStr.SubString(timeStr.First('-')+1,timeStr.Length());
-
-
-
+
+
+
+
+
-        }
-        //disk usage
-        m_txtDiskMaxSpace->GetValue().ToDouble(&td);
@@ -711 +706 @@
-        return res==wxYES;
-}
-
+
+

clientgui/sg_DlgPreferences.cpp

@@ -736 +736 @@
-    aWorkBetweenBegin.Insert(_("Anytime"), 0);
-
-    m_WorkBetweenBeginCtrl->Append(aWorkBetweenBegin);
-time_prefs.start_hour == display_global_preferences.time_pref
+cpu_times.start_hour == display_global_preferences.cpu_time
-        m_strWorkBetweenBegin = _("Anytime");
-    } else {
-time_pref
+cpu_time
-    }
-
-    //   End:
-    m_WorkBetweenEndCtrl->Append(wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings));
-time_pref
+cpu_time
-
-    // Connect to internet only between:
-    //   Start:
@@ -752 +752 @@
-    aConnectBetweenBegin.Insert(_("Anytime"), 0);
-
-    m_ConnectBetweenBeginCtrl->Append(aConnectBetweenBegin);
-time_prefs.net_start_hour == display_global_preferences.time_prefs.net_
+net_times.start_hour == display_global_preferences.net_times.
-        m_strConnectBetweenBegin = _("Anytime");
-    } else {
-time_prefs.net_
+net_times.
-    }
-
-    //   End:
-    m_ConnectBetweenEndCtrl->Append(wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings));
-time_prefs.net_
+net_times.
-
-    // Use no more than %s of disk space
-    wxArrayString aDiskUsage = wxArrayString(iDiskUsageArraySize, astrDiskUsageStrings);
@@ -912 +912 @@
-bool CPanelPreferences::SavePreferenceSettings() {
-    // Do work only between:
-    if (_("Anytime") == m_strWorkBetweenBegin) {
-time_pref
-time_pref
+cpu_time
+cpu_time
-    } else {
-time_pref
-time_pref
+cpu_time
+cpu_time
-    }
-    global_preferences_mask.start_hour = true;        
-    global_preferences_mask.end_hour = true;
-
-    // Connect to internet only between:
-    if (_("Anytime") == m_strConnectBetweenBegin) {
-time_prefs.net_
-time_prefs.net_
+net_times.
+net_times.
-    } else {
-time_prefs.net_
-time_prefs.net_
+net_times.
+net_times.
-    }
-    global_preferences_mask.net_start_hour = true;        
-    global_preferences_mask.net_end_hour = true;        
@@ -1085 +1085 @@
-    EndModal(wxID_OK);
-}
-
+
+

lib/prefs.C

@@ -43 +43 @@
-    memset(this, 0, sizeof(GLOBAL_PREFS_MASK));
-}
-
+void GLOBAL_PREFS_MASK::set_all() {
+    run_on_batteries = true;
+    run_if_user_active = true;
+    idle_time_to_run = true;
+    suspend_if_no_recent_input = true;
+    start_hour = true;
+    end_hour = true;
+    net_start_hour = true;
+    net_end_hour = true;
+    leave_apps_in_memory = true;
+    confirm_before_connecting = true;
+    hangup_if_dialed = true;
+    dont_verify_images = true;
+    work_buf_min_days = true;
+    work_buf_additional_days = true;
+    max_cpus = true;
+    cpu_scheduling_period_minutes = true;
+    disk_interval = true;
+    disk_max_used_gb = true;
+    disk_max_used_pct = true;
+    disk_min_free_gb = true;
+    vm_max_used_frac = true;
+        ram_max_used_busy_frac = true;
+        ram_max_used_idle_frac = true;
+    idle_time_to_run = true;
+    max_bytes_sec_up = true;
+    max_bytes_sec_down = true;
+    cpu_usage_limit = true;
+}
+
-bool GLOBAL_PREFS_MASK::are_prefs_set() {
-    if (run_on_batteries) return true;
-    if (run_if_user_active) return true;
-    if (idle_time_to_run) return true;
-    if (suspend_if_no_recent_input) return true;
-         // 0..23; no restriction if start==end
+
-    if (end_hour) return true;
-     // 0..23; no restriction if start==end
+
-    if (net_end_hour) return true;
-    if (leave_apps_in_memory) return true;
-    if (confirm_before_connecting) return true;
@@ -87 +117 @@
-    return false;
-}
-
+
+// TIME_SPAN implementation
+
+bool TIME_SPAN::suspended(double hour) const {
+
+    if (start_hour == end_hour) return false;
+    if (start_hour == 0 && end_hour == 24) return false;
+    if (start_hour == 24 && end_hour == 0) return true;
+    if (start_hour < end_hour) {
+        return (hour < start_hour || hour > end_hour);
+    } else {
+        return (hour >= end_hour && hour < start_hour);
+    }
+}
+
+
+TIME_SPAN::TimeMode TIME_SPAN::mode() const {
+
+    if (end_hour == start_hour || (start_hour == 0.0 && end_hour == 24.0)) {
+        return Always;
+    } else if (start_hour == 24.0 && end_hour == 0.0) {
+        return Never;
+    }
+    return Between;
+}
+
+
+// TIME_PREFS implementation
+
-void TIME_PREFS::clear() {
-    start_hour = 0;
-    end_hour = 0;
-
-
+
-}
-
+
+bool TIME_PREFS::suspended() const {
+    time_t now = time(0);
+    struct tm* tmp = localtime(&now);
+    double hour = (tmp->tm_hour * 3600 + tmp->tm_min * 60 + tmp->tm_sec) / 3600.;
+    int day = tmp->tm_wday;
+
+    // Use day-specific settings, if they exist:
+    const TIME_SPAN* span = week.get(day) ? week.get(day) : this;
+
+    return span->suspended(hour);
+}
+
+
+// WEEK_PREFS implementation
+
+WEEK_PREFS::WEEK_PREFS() {
+
+    for (int i = 0; i < 7; i++) {
+        days[i] = 0;
+    }
+}
+
+
+WEEK_PREFS::WEEK_PREFS(const WEEK_PREFS& original) {
+
+    for (int i = 0; i < 7; i++) {
+        TIME_SPAN* time = original.days[i];
+        if (time) {
+            days[i] = new TIME_SPAN(time->start_hour, time->end_hour);
+        } else {
+            days[i] = 0;
+        }
+    }
+}
+
+
+WEEK_PREFS& WEEK_PREFS::operator=(const WEEK_PREFS& rhs) {
+
+    if (this != &rhs) {
+        for (int i = 0; i < 7; i++) {
+            TIME_SPAN* time = rhs.days[i];
+            if (time) {
+                if (days[i]) {
+                    *days[i] = *time;
+                } else {
+                    days[i] = new TIME_SPAN(*time);
+                }
+            } else {
+                unset(i);
+            }
+        }
+    }
+    return *this;
+}
+
+
+// Create a deep copy.
+void WEEK_PREFS::copy(const WEEK_PREFS& original) {
+
+    for (int i = 0; i < 7; i++) {
+        TIME_SPAN* time = original.days[i];
+        if (time) {
+            days[i] = new TIME_SPAN(time->start_hour, time->end_hour);
+        } else {
+            days[i] = 0;
+        }
+    }
+}
+
+
+WEEK_PREFS::~WEEK_PREFS() {
+    clear();
+}
+
+
+void WEEK_PREFS::clear() {
+
+    for (int i = 0; i < 7; i++) {
+        if (days[i]) {
+            delete days[i];
+            days[i] = 0;
+        }
+    }
+}
+
+
+TIME_SPAN* WEEK_PREFS::get(int day) const {
+
+    if (day < 0 || day > 6) return 0;
+    return days[day];
+}
+
+
+void WEEK_PREFS::set(int day, double start, double end) {
+
+    if (day < 0 || day > 6) return;
+
+    if (days[day]) delete days[day];
+    days[day] = new TIME_SPAN(start, end);
+}
+
+
+void WEEK_PREFS::set(int day, TIME_SPAN* time) {
+
+    if (day < 0 || day > 6) return;
+    if (days[day] == time) return;
+    if (days[day]) delete days[day];
+
+    days[day] = time;
+}
+
+void WEEK_PREFS::unset(int day) {
+
+    if (day < 0 || day > 6) return;
+
+    if (days[day]) {
+        delete days[day];
+        days[day] = 0;
+    }
+}
+
-// The following values determine how the client behaves
-// if there are no global prefs (e.g. on our very first RPC).
-// These should impose minimal restrictions,
@@ -104 +284 @@
-    run_if_user_active = true;
-    idle_time_to_run = 3;
-    suspend_if_no_recent_input = 0;
-
+
+
-    leave_apps_in_memory = false;
-    confirm_before_connecting = true;
-    hangup_if_dialed = false;
@@ -123 +304 @@
-    max_bytes_sec_up = 0;
-    max_bytes_sec_down = 0;
-    cpu_usage_limit = 100;
-    week_prefs.present = false;
-    week_prefs.clear();
-    // don't initialize source_project, source_scheduler,
-    // mod_time, host_specific here
-    // since they are outside of <venue> elements,
@@ -140 +319 @@
-    confirm_before_connecting = false;
-    hangup_if_dialed = false;
-    dont_verify_images = false;
-    for (int i=0; i<7; i++) {
-        week_prefs.days[i].present = false;
-    }
-}
-
-bool TIME_PREFS::suspended(double hour, int which) {
-    double start, end;
-    switch (which) {
-    case PREFS_CPU:
-        start = start_hour;
-        end = end_hour;
-        break;
-    case PREFS_NETWORK:
-        start = net_start_hour;
-        end = net_end_hour;
-        break;
-    default:
-        return false;
-    }
-    if (start==end) return false;
-    if (start==0 && end==24) return false;  // redundant?
-    if (start==24 && end==0) return true;
-    if (start < end) {
-        return (hour < start || hour > end);
-    } else {
-        return (hour >= end && hour < start);
-    }
-}
-
-bool GLOBAL_PREFS::suspended_time_of_day(int which) {
-    time_t now = time(0);
-    struct tm *tmp = localtime(&now);
-    double hour = (tmp->tm_hour*3600 + tmp->tm_min*60 + tmp->tm_sec)/3600.;
-    int day = tmp->tm_wday;
-
-    if (week_prefs.present && week_prefs.days[day].present) {
-        return week_prefs.days[day].time_prefs.suspended(hour, which);
-    } else {
-        return time_prefs.suspended(hour, which);
-    }
-}
-
-GLOBAL_PREFS::GLOBAL_PREFS() {
-    defaults();
-}
@@ -202 +341 @@
-    return parse_override(xp, host_venue, found_venue, mask);
-}
-
-DAY_PREFS::parse
+GLOBAL_PREFS::parse_day
-    char tag[256];
-    bool is_tag;
-
-
-
+
+
+
+
+
+
+
+
-    while (!xp.get(tag, sizeof(tag), is_tag)) {
-        if (!is_tag) continue;
-        if (!strcmp(tag, "/day_prefs")) {
-            if (day_of_week < 0 || day_of_week > 6) return ERR_XML_PARSE;
+            if (has_cpu) {
+                cpu_times.week.set(day_of_week, start_hour, end_hour);
+            }
+            if (has_net) {
+                net_times.week.set(day_of_week, net_start_hour, net_end_hour);
+            }
-            return 0;
-        }
-        if (xp.parse_int(tag, "day_of_week", day_of_week)) continue;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return ERR_XML_PARSE;
-}
-
-void WEEK_PREFS::clear() {
-    memset(this, 0, sizeof(*this));
-}
-
-// Parse global prefs, overriding whatever is currently in the structure.
-//
@@ -245 +405 @@
-    char tag[256], buf2[256];
-    bool in_venue = false, in_correct_venue=false, is_tag;
-    double dtemp;
-    int retval;
-
-    found_venue = false;
-    mask.clear();
@@ -304 +463 @@
-            mask.suspend_if_no_recent_input = true;
-            continue;
-        }
-time_pref
+cpu_time
-            mask.start_hour = true;
-            continue;
-        }
-time_pref
+cpu_time
-            mask.end_hour = true;
-            continue;
-        }
-time_prefs.net_
+net_times.
-            mask.net_start_hour = true;
-            continue;
-        }
-time_prefs.net_
+net_times.
-            mask.net_end_hour = true;
-            continue;
-        }
-        if (!strcmp(tag, "day_prefs")) {
-
-
-
-
-
-
-
+
-            continue;
-        }
-        if (xp.parse_bool(tag, "leave_apps_in_memory", leave_apps_in_memory)) {
@@ -477 +630 @@
-        "   <idle_time_to_run>%f</idle_time_to_run>\n"
-        "   <max_bytes_sec_up>%f</max_bytes_sec_up>\n"
-        "   <max_bytes_sec_down>%f</max_bytes_sec_down>\n"
-
-
+
-        mod_time,
-        run_on_batteries?"   <run_on_batteries/>\n":"",
-        run_if_user_active?"   <run_if_user_active/>\n":"",
-        suspend_if_no_recent_input,
-time_pref
-time_pref
-time_prefs.net_
-time_prefs.net_
+cpu_time
+cpu_time
+net_times.
+net_times.
-        leave_apps_in_memory?"   <leave_apps_in_memory/>\n":"",
-        confirm_before_connecting?"   <confirm_before_connecting/>\n":"",
-        hangup_if_dialed?"   <hangup_if_dialed/>\n":"",
@@ -507 +659 @@
-        max_bytes_sec_down,
-        cpu_usage_limit
-    );
+
+    for (int i = 0; i < 7; i++) {
+                TIME_SPAN* cpu = cpu_times.week.get(i);
+        TIME_SPAN* net = net_times.week.get(i);
+                //write only when needed
+                if (net || cpu) {
+                        
+                        f.printf("   <day_prefs>\n");                           
+                        f.printf("      <day_of_week>%d</day_of_week>\n", i);
+                        if (cpu) {
+                                f.printf("      <start_hour>%.02f</start_hour>\n", cpu->start_hour);
+                                f.printf("      <end_hour>%.02f</end_hour>\n", cpu->end_hour);
+                        }
+                        if (net) {
+                                f.printf("      <net_start_hour>%.02f</net_start_hour>\n", net->start_hour);
+                                f.printf("      <net_end_hour>%.02f</net_end_hour>\n", net->end_hour);
+                        }
+                        f.printf("   </day_prefs>\n");
+                }
+        }
+    f.printf("</global_preferences>\n");
+
-    return 0;
-}
-
@@ -537 +711 @@
-        );
-    }
-    if (mask.start_hour) {
-time_pref
+cpu_time
-    }
-    if (mask.end_hour) {
-time_pref
+cpu_time
-    }
-    if (mask.net_start_hour) {
-time_prefs.net_
+net_times.
-    }
-    if (mask.net_end_hour) {
-time_prefs.net_
+net_times.
-    }
-    if (mask.leave_apps_in_memory) {
-        f.printf("   <leave_apps_in_memory>%d</leave_apps_in_memory>\n",
@@ -610 +784 @@
-    if (mask.cpu_usage_limit) {
-        f.printf("   <cpu_usage_limit>%f</cpu_usage_limit>\n", cpu_usage_limit);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
+                        if (net) {
+                                f.printf("      <net_start_hour>%.02f</net_start_hour>\n", net->start_hour);
+                                f.printf("      <net_end_hour>%.02f</net_end_hour>\n", net->end_hour);
+                        }
+                        f.printf("   </day_prefs>\n");
-                }
-        }
+
-    f.printf("</global_preferences>\n");
-    
-    return 0;
@@ -639 +812 @@
-
-const char *BOINC_RCSID_3fb442bb02 = "$Id$";
-
+
+

lib/prefs.h

@@ -41 +41 @@
-    bool run_if_user_active;
-    bool idle_time_to_run;
-    bool suspend_if_no_recent_input;
-     // 0..23; no restriction if start==end
+
-    bool end_hour;
-     // 0..23; no restriction if start==end
+
-    bool net_end_hour;
-    bool leave_apps_in_memory;
-    bool confirm_before_connecting;
@@ -68 +68 @@
-    void clear();
-    bool are_prefs_set();
-    bool are_simple_prefs_set();
+    void set_all();
-};
-
-#define PREFS_CPU       0
-#define PREFS_NETWORK   1
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-};
-
-struct DAY_PREFS {
-    bool present;
-    int day_of_week;
-    TIME_PREFS time_prefs;
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-    void clear();
+    WEEK_PREFS& operator=(const WEEK_PREFS& rhs);
+
+protected:
+    void copy(const WEEK_PREFS& original);
+    TIME_SPAN* days[7];
+
-};
-
+
+class TIME_PREFS : public TIME_SPAN {
+public:
+    TIME_PREFS() : TIME_SPAN() {}
+    TIME_PREFS(double start, double end)
+        : TIME_SPAN(start, end) {}
+    
+    void        clear();
+    bool        suspended() const;
+    
+    WEEK_PREFS  week;
+};
+
+
-struct GLOBAL_PREFS {
-    int mod_time;
-    bool run_on_batteries;
@@ -111 +141 @@
-    bool confirm_before_connecting;
-    bool hangup_if_dialed;
-    bool dont_verify_images;
-
+
+
-    double work_buf_min_days;
-    double work_buf_additional_days;
-    int max_cpus;
@@ -129 +160 @@
-    char source_project[256];
-    char source_scheduler[256];
-    bool host_specific;
-    WEEK_PREFS week_prefs;
-
-    GLOBAL_PREFS();
-    void defaults();
-    void clear_bools();
-    int parse(XML_PARSER&, const char* venue, bool& found_venue, GLOBAL_PREFS_MASK& mask);
+    int parse_day(XML_PARSER&);
-    int parse_override(XML_PARSER&, const char* venue, bool& found_venue, GLOBAL_PREFS_MASK& mask);
-    int parse_file(const char* filename, const char* venue, bool& found_venue);
-    int write(MIOFILE&);
-    int write_subset(MIOFILE&, GLOBAL_PREFS_MASK&);
-    bool suspended_time_of_day(int);
-    inline double cpu_scheduling_period() {
-        return cpu_scheduling_period_minutes*60;
-    }