*** empty log message ***

svn path=/trunk/boinc/; revision=10921
This commit is contained in:
David Anderson 2006-08-15 17:02:49 +00:00
parent 5a9447deef
commit c86e685ac3
4 changed files with 20 additions and 30 deletions

View File

@ -8843,3 +8843,13 @@ Charlie 15 Aug 2006
client/ client/
cpu_sched.C cpu_sched.C
cs_scheduler.C cs_scheduler.C
David 15 Aug 2006
- core client: removed <work_fetch_debug/> message
- Manager: changed one wxDateTime to double (should change all)
client/
cs_scheduler.C
clientgui/
MainDocument.cpp,h

View File

@ -175,11 +175,6 @@ PROJECT* CLIENT_STATE::next_project_need_work() {
double work_on_prospect=0; double work_on_prospect=0;
unsigned int i; unsigned int i;
double prrs = potentially_runnable_resource_share(); double prrs = potentially_runnable_resource_share();
if (log_flags.work_fetch_debug) {
msg_printf(0, MSG_INFO,
"next_project_need_work: begin"
);
}
for (i=0; i<projects.size(); i++) { for (i=0; i<projects.size(); i++) {
p = projects[i]; p = projects[i];

View File

@ -22,10 +22,13 @@
#endif #endif
#include "stdwx.h" #include "stdwx.h"
#include "error_numbers.h"
#include "util.h"
#include "BOINCGUIApp.h" #include "BOINCGUIApp.h"
#include "BOINCBaseFrame.h" #include "BOINCBaseFrame.h"
#include "MainDocument.h" #include "MainDocument.h"
#include "error_numbers.h"
#ifdef SANDBOX #ifdef SANDBOX
#include <grp.h> #include <grp.h>
@ -291,7 +294,7 @@ CMainDocument::CMainDocument() {
m_bCachedStateLocked = false; m_bCachedStateLocked = false;
m_dtCachedStateLockTimestamp = wxDateTime::Now(); m_dtCachedStateLockTimestamp = wxDateTime::Now();
m_dtCachedStateTimestamp = wxDateTime((time_t)0); m_dtCachedStateTimestamp = wxDateTime((time_t)0);
cc_status_timestamp = wxDateTime((time_t)0); cc_status_timestamp = dtime();
m_dtCachedActivityRunModeTimestamp = wxDateTime((time_t)0); m_dtCachedActivityRunModeTimestamp = wxDateTime((time_t)0);
m_dtCachedNetworkRunModeTimestamp = wxDateTime((time_t)0); m_dtCachedNetworkRunModeTimestamp = wxDateTime((time_t)0);
m_dtCachedProjecStatusTimestamp = wxDateTime((time_t)0); m_dtCachedProjecStatusTimestamp = wxDateTime((time_t)0);
@ -304,25 +307,6 @@ CMainDocument::CMainDocument() {
CMainDocument::~CMainDocument() { CMainDocument::~CMainDocument() {
m_dtStatisticsStatusTimestamp = wxDateTime::Now();
m_dtResourceStatusTimestamp = wxDateTime::Now();
m_dtFileTransfersTimestamp = wxDateTime::Now();
m_dtCachedResultsTimestamp = wxDateTime::Now();
m_dtCachedProjecStatusTimestamp = wxDateTime::Now();
m_dtCachedNetworkRunModeTimestamp = wxDateTime::Now();
m_dtCachedActivityRunModeTimestamp = wxDateTime::Now();
cc_status_timestamp = wxDateTime::Now();
m_dtCachedStateTimestamp = wxDateTime::Now();
m_dtCachedStateLockTimestamp = wxDateTime::Now();
m_bCachedStateLocked = false;
m_iMessageSequenceNumber = 0;
m_fProjectTotalResourceShare = 0.0;
m_iCachedActivityRunMode = 0;
m_iCachedNetworkRunMode = 0;
#ifdef __WIN32__ #ifdef __WIN32__
WSACleanup(); WSACleanup();
#endif #endif
@ -561,9 +545,10 @@ int CMainDocument::SetNetworkRunMode(int iMode) {
int CMainDocument::get_cc_status(CC_STATUS& ccs) { int CMainDocument::get_cc_status(CC_STATUS& ccs) {
int iRetVal = 0; int iRetVal = 0;
wxTimeSpan ts(wxDateTime::Now() - cc_status_timestamp); double now = dtime();
if (ts.GetSeconds() > 0.5) { double diff = now - cc_status_timestamp;
cc_status_timestamp = wxDateTime::Now(); if (diff > 0.5) {
cc_status_timestamp = now;
if (IsConnected()) { if (IsConnected()) {
iRetVal = rpc.get_cc_status(ccs); iRetVal = rpc.get_cc_status(ccs);

View File

@ -83,7 +83,7 @@ private:
wxDateTime m_dtCachedActivityRunModeTimestamp; wxDateTime m_dtCachedActivityRunModeTimestamp;
wxDateTime m_dtCachedNetworkRunModeTimestamp; wxDateTime m_dtCachedNetworkRunModeTimestamp;
wxDateTime cc_status_timestamp; double cc_status_timestamp;
int m_iCachedActivityRunMode; int m_iCachedActivityRunMode;
int m_iCachedNetworkRunMode; int m_iCachedNetworkRunMode;
CC_STATUS cc_status; CC_STATUS cc_status;