Skip to content
Snippets Groups Projects
Commit 6510a693 authored by Oliver Bock's avatar Oliver Bock
Browse files

Improved shared memory handling and code cleanup

* We have to check for shmem availability every time as things might have changed
* Renamed update* to read* (for "update" the direction is ambiguous)
* Renamed getters (no more "get" prefix)
parent 380d0f23
Branches
Tags
No related merge requests found
...@@ -4,29 +4,22 @@ BOINCClientAdapter::BOINCClientAdapter() ...@@ -4,29 +4,22 @@ BOINCClientAdapter::BOINCClientAdapter()
{ {
updateUserInfo(); updateUserInfo();
m_SharedMemoryArea = (char*) boinc_graphics_get_shmem(EAH_SHMEM_APP_NAME);
if(m_SharedMemoryArea) {
updateSharedMemoryArea();
m_SharedMemoryAreaAvailable = true;
}
else {
m_SharedMemoryAreaAvailable = false; m_SharedMemoryAreaAvailable = false;
} readSharedMemoryArea();
} }
BOINCClientAdapter::~BOINCClientAdapter() BOINCClientAdapter::~BOINCClientAdapter()
{ {
} }
void BOINCClientAdapter::updateUserInfo() void BOINCClientAdapter::readUserInfo()
{ {
boinc_get_init_data(m_UserData); boinc_get_init_data(m_UserData);
} }
void BOINCClientAdapter::updateSharedMemoryArea() void BOINCClientAdapter::readSharedMemoryArea()
{ {
if(m_SharedMemoryArea) { if(m_SharedMemoryAreaAvailable) {
if(3 != sscanf( (char*)shmem, if(3 != sscanf( (char*)shmem,
" <graphics_info> \n" " <graphics_info> \n"
...@@ -40,81 +33,92 @@ void BOINCClientAdapter::updateSharedMemoryArea() ...@@ -40,81 +33,92 @@ void BOINCClientAdapter::updateSharedMemoryArea()
cerr << "Incompatible shared memory data encountered!" << endl; cerr << "Incompatible shared memory data encountered!" << endl;
} }
} }
else {
m_SharedMemoryArea = (char*) boinc_graphics_get_shmem(EAH_SHMEM_APP_NAME);
if(m_SharedMemoryArea) {
m_SharedMemoryAreaAvailable = true;
readSharedMemoryArea();
}
else {
m_SharedMemoryAreaAvailable = false;
}
}
} }
string BOINCClientAdapter::getCoreVersion() const string BOINCClientAdapter::coreVersion() const
{ {
// int major_version;int minor_version;int release; // int major_version;int minor_version;int release;
} }
string BOINCClientAdapter::getApplicationName() const string BOINCClientAdapter::applicationName() const
{ {
} }
string BOINCClientAdapter::getApplicationVersion() const string BOINCClientAdapter::applicationVersion() const
{ {
} }
string BOINCClientAdapter::getUserName() const string BOINCClientAdapter::userName() const
{ {
} }
string BOINCClientAdapter::getTeamName() const string BOINCClientAdapter::teamName() const
{ {
} }
double BOINCClientAdapter::getUserCredit() const double BOINCClientAdapter::userCredit() const
{ {
} }
double BOINCClientAdapter::getUserRACredit() const double BOINCClientAdapter::userRACredit() const
{ {
} }
double BOINCClientAdapter::getHostCredit() const double BOINCClientAdapter::hostCredit() const
{ {
} }
double BOINCClientAdapter::getHostRACredit() const double BOINCClientAdapter::hostRACredit() const
{ {
} }
string BOINCClientAdapter::getWUName() const string BOINCClientAdapter::wuName() const
{ {
} }
double BOINCClientAdapter::getWUCPUTime() const double BOINCClientAdapter::wuCPUTime() const
{ {
} }
double BOINCClientAdapter::getWUFPOpsEstimated() const double BOINCClientAdapter::wuFPOpsEstimated() const
{ {
} }
double BOINCClientAdapter::getWUFPOpsBound() const double BOINCClientAdapter::wuFPOpsBound() const
{ {
} }
double BOINCClientAdapter::getWUMemoryBound() const double BOINCClientAdapter::wuMemoryBound() const
{ {
} }
double BOINCClientAdapter::getWUDiskBound() const double BOINCClientAdapter::wuDiskBound() const
{ {
} }
...@@ -14,27 +14,27 @@ public: ...@@ -14,27 +14,27 @@ public:
BOINCClientAdapter(); BOINCClientAdapter();
virtual ~BOINCClientAdapter(); virtual ~BOINCClientAdapter();
string getCoreVersion() const; string coreVersion() const;
string getApplicationName() const; string applicationName() const;
string getApplicationVersion() const; string applicationVersion() const;
string getUserName() const; string userName() const;
string getTeamName() const; string teamName() const;
double getUserCredit() const; double userCredit() const;
double getUserRACredit() const; double userRACredit() const;
double getHostCredit() const; double hostCredit() const;
double getHostRACredit() const; double hostRACredit() const;
string getWUName() const; string wuName() const;
double getWUCPUTime() const; double wuCPUTime() const;
double getWUFPOpsEstimated() const; double wuFPOpsEstimated() const;
double getWUFPOpsBound() const; double wuFPOpsBound() const;
double getWUMemoryBound() const; double wuMemoryBound() const;
double getWUDiskBound() const; double wuDiskBound() const;
private: private:
void updateUserInfo(); void readUserInfo();
void updateSharedMemoryArea(); void readSharedMemoryArea();
char *m_SharedMemoryArea; char *m_SharedMemoryArea;
bool m_SharedMemoryAreaAvailable; bool m_SharedMemoryAreaAvailable;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment