- scheduler: removed unused destructors in COPROC that

caused scheduler to crash (not sure why)


svn path=/trunk/boinc/; revision=23312
This commit is contained in:
David Anderson 2011-04-01 21:21:11 +00:00
parent 64aae21969
commit a7828abdda
6 changed files with 20 additions and 22 deletions

View File

@ -2069,3 +2069,13 @@ David 1 Apr 2011
Makefile.am
client/
coproc_detect.cpp
David 1 Apr 2011
- scheduler: removed unused destructors in COPROC that
caused scheduler to crash (not sure why)
sched/
sched_types.cpp,h
lib/
coproc.h
procinfo.h

View File

@ -24,7 +24,7 @@ Instructions for installing and running BOINC are
<a href=http://boinc.berkeley.edu/wiki/User_manual>here</a>.
<li>
To submit an item for inclusion in this list,
please email <a href=contact.php>David Anderson</a>.
please email <a href=http://boinc.berkeley.edu/trac/wiki/ProjectPeople>David Anderson</a>.
</ul>
";

View File

@ -203,7 +203,6 @@ struct COPROC {
COPROC() {
clear();
}
virtual ~COPROC(){}
void print_available_ram();
};
@ -242,7 +241,6 @@ struct COPROC_NVIDIA : public COPROC {
virtual void write_xml(MIOFILE&, bool include_request);
#endif
COPROC_NVIDIA(): COPROC("NVIDIA"){}
virtual ~COPROC_NVIDIA(){}
void get(
bool use_all,
std::vector<std::string>&, std::vector<std::string>&,
@ -282,7 +280,6 @@ struct COPROC_ATI : public COPROC {
virtual void write_xml(MIOFILE&, bool include_request);
#endif
COPROC_ATI(): COPROC("ATI"){}
virtual ~COPROC_ATI(){}
void get(
bool use_all,
std::vector<std::string>&, std::vector<std::string>&,
@ -307,8 +304,6 @@ struct COPROCS {
COPROC_NVIDIA nvidia;
COPROC_ATI ati;
COPROCS(){}
~COPROCS(){} // don't delete coprocs; else crash in APP_INIT_DATA logic
void write_xml(MIOFILE& out, bool include_request);
void get(
bool use_all, std::vector<std::string> &descs,

View File

@ -17,17 +17,17 @@
// platform-independent process-enumeration functions
#if defined(_WIN32) && !defined(__STDWX_H__)
#include "boinc_win.h"
#elif defined(_WIN32) && defined(__STDWX_H__)
#include "stdwx.h"
#else
#include "config.h"
#if defined(_WIN32) && !defined(__STDWX_H__)
#include "boinc_win.h"
#elif defined(_WIN32) && defined(__STDWX_H__)
#include "stdwx.h"
#else
#include "config.h"
#include <sys/types.h>
#include <sys/wait.h>
#include <string.h>
#include <signal.h>
#endif
#endif
#include "procinfo.h"

View File

@ -177,13 +177,6 @@ void WORK_REQ::add_no_work_message(const char* message) {
no_work_messages.push_back(USER_MESSAGE(message, "notice"));
}
SCHEDULER_REQUEST::SCHEDULER_REQUEST() {
}
SCHEDULER_REQUEST::~SCHEDULER_REQUEST() {
}
// return an error message or NULL
//
const char* SCHEDULER_REQUEST::parse(FILE* fin) {

View File

@ -315,8 +315,8 @@ struct SCHEDULER_REQUEST {
int last_rpc_dayofyear;
int current_rpc_dayofyear;
SCHEDULER_REQUEST();
~SCHEDULER_REQUEST();
SCHEDULER_REQUEST(){};
~SCHEDULER_REQUEST(){};
const char* parse(FILE*);
int write(FILE*); // write request info to file: not complete
};