*** empty log message ***

svn path=/trunk/boinc/; revision=9734
This commit is contained in:
Rom Walton 2006-03-27 07:55:04 +00:00
parent f07b6d8c1e
commit 6d0c553aed
6 changed files with 143 additions and 88 deletions

View File

@ -3284,3 +3284,14 @@ Rom 26 Mar 2006
ViewWork.cpp
locale/client/en_US/
BOINC Manager.mo, .po
Rom 26 Mar 2006
- Bug Fix: Since we changed over to async connections the manager has been
shutting down which ever client is was currently connected to. So
wait until we have successfully reconnected to the local BOINC client
and verify we are connected to the local BOINC client before sending
the quit command.
clientgui/
BOINCGUIApp.cpp
MainDocument.cpp, .h

View File

@ -700,24 +700,35 @@ void CBOINCGUIApp::StartupBOINCCore() {
void CBOINCGUIApp::ShutdownBOINCCore() {
wxInt32 iCount = 0;
bool bClientQuit = false;
wxString strConnectedCompter = wxEmptyString;
DWORD dwExitCode;
wxString strMachineName = wxT("localhost");
if (m_bBOINCStartedByManager) {
// The user may have gone off to look at another machine on the network, and
// we don't want to leave any dangling processes if we started them up.
m_pDocument->Connect(strMachineName);
if (GetExitCodeProcess(m_hBOINCCoreProcess, &dwExitCode)) {
if (STILL_ACTIVE == dwExitCode) {
m_pDocument->CoreClientQuit();
for (iCount = 0; iCount <= 10; iCount++) {
if (!bClientQuit && GetExitCodeProcess(m_hBOINCCoreProcess, &dwExitCode)) {
if (STILL_ACTIVE != dwExitCode) {
bClientQuit = true;
continue;
// Wait for up to 10 seconds to finish the async reconnection
m_pDocument->Connect(wxT("localhost"), wxEmptyString, true, true);
for (iCount = 0; iCount <= 10; iCount++) {
if (m_pDocument->IsConnected()) {
continue;
}
::Sleep(1);
}
m_pDocument->GetConnectedComputerName(strConnectedCompter);
if (m_pDocument->IsComputerNameLocal(strConnectedCompter)) {
if (GetExitCodeProcess(m_hBOINCCoreProcess, &dwExitCode)) {
if (STILL_ACTIVE == dwExitCode) {
m_pDocument->CoreClientQuit();
for (iCount = 0; iCount <= 10; iCount++) {
if (!bClientQuit && GetExitCodeProcess(m_hBOINCCoreProcess, &dwExitCode)) {
if (STILL_ACTIVE != dwExitCode) {
bClientQuit = true;
continue;
}
}
::Sleep(1);
}
::Sleep(1);
}
}
}
@ -777,17 +788,26 @@ void CBOINCGUIApp::ShutdownBOINCCore() {
wxString strMachineName = wxT("localhost");
if (m_bBOINCStartedByManager) {
// The user may have gone off to look at another machine on the network, and
// we don't want to leave any dangling processes if we started them up.
m_pDocument->Connect(strMachineName);
if (ProcessExists(m_lBOINCCoreProcessId)) {
m_pDocument->CoreClientQuit();
for (iCount = 0; iCount <= 10; iCount++) {
if (!ProcessExists(m_lBOINCCoreProcessId))
return;
// The user may have gone off to look at another machine on the network, and
// we don't want to leave any dangling processes if we started them up.
// Wait for up to 10 seconds to finish the async reconnection
m_pDocument->Connect(wxT("localhost"), wxEmptyString, true, true);
for (iCount = 0; iCount <= 10; iCount++) {
if (m_pDocument->IsConnected()) {
continue;
}
::Sleep(1);
}
m_pDocument->GetConnectedComputerName(strConnectedCompter);
if (m_pDocument->IsComputerNameLocal(strConnectedCompter)) {
if (ProcessExists(m_lBOINCCoreProcessId)) {
m_pDocument->CoreClientQuit();
for (iCount = 0; iCount <= 10; iCount++) {
if (!ProcessExists(m_lBOINCCoreProcessId))
return;
::wxSleep(1);
::wxSleep(1);
}
}
}
@ -806,15 +826,25 @@ void CBOINCGUIApp::ShutdownBOINCCore() {
if (m_bBOINCStartedByManager) {
// The user may have gone off to look at another machine on the network, and
// we don't want to leave any dangling processes if we started them up.
m_pDocument->Connect(strMachineName);
if (wxProcess::Exists(m_lBOINCCoreProcessId)) {
m_pDocument->CoreClientQuit();
for (iCount = 0; iCount <= 10; iCount++) {
if (!bClientQuit && !wxProcess::Exists(m_lBOINCCoreProcessId)) {
bClientQuit = true;
continue;
// Wait for up to 10 seconds to finish the async reconnection
m_pDocument->Connect(wxT("localhost"), wxEmptyString, true, true);
for (iCount = 0; iCount <= 10; iCount++) {
if (m_pDocument->IsConnected()) {
continue;
}
::Sleep(1);
}
m_pDocument->GetConnectedComputerName(strConnectedCompter);
if (m_pDocument->IsComputerNameLocal(strConnectedCompter)) {
if (wxProcess::Exists(m_lBOINCCoreProcessId)) {
m_pDocument->CoreClientQuit();
for (iCount = 0; iCount <= 10; iCount++) {
if (!bClientQuit && !wxProcess::Exists(m_lBOINCCoreProcessId)) {
bClientQuit = true;
continue;
}
::wxSleep(1);
}
::wxSleep(1);
}
}

View File

@ -48,6 +48,7 @@ CNetworkConnection::CNetworkConnection(CMainDocument* pDocument) :
CNetworkConnection::~CNetworkConnection() {
}
void CNetworkConnection::GetLocalPassword(wxString& strPassword){
char buf[256];
@ -66,9 +67,8 @@ void CNetworkConnection::GetLocalPassword(wxString& strPassword){
strPassword = wxString(buf, wxConvUTF8);
}
// TODO: get rid of "reconnecting" stuff
void* CNetworkConnection::Poll() {
void CNetworkConnection::Poll() {
int retval;
wxString strComputer = wxEmptyString;
wxString strComputerPassword = wxEmptyString;
@ -138,8 +138,6 @@ void* CNetworkConnection::Poll() {
}
}
}
return NULL;
}

View File

@ -33,9 +33,9 @@ public:
CNetworkConnection(CMainDocument* pDocument);
~CNetworkConnection();
virtual void* Poll();
void Poll();
void FireReconnectEvent() { m_bConnectEvent = true; };
void ForceReconnect() { m_bForceReconnect = true; };
void ForceReconnect() { m_bForceReconnect = true; m_bConnected = false; };
int FrameShutdownDetected();
int GetConnectedComputerName(wxString& strMachine);
int GetConnectingComputerName(wxString& strMachine);

Binary file not shown.

View File

@ -2,9 +2,9 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC Manager 4.x\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2006-03-09 21:09+0200\n"
"PO-Revision-Date: 2006-03-27 10:28+0200\n"
"Last-Translator: Son Goku 3SSJ <timeros@gmail.com>\n"
"Language-Team: BOINC Development Team <rwalton@ssl.berkeley.edu>\n"
"Language-Team: AMD Powered @ Home Team <timeros@gmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-5\n"
"Content-Transfer-Encoding: 8bit\n"
@ -211,7 +211,7 @@ msgstr ""
"\n"
"¼ÞÛï ßÞáÕâÕâÕ áÐÙâÐ ÝÐ ßàÞÕÚâÐ Ø áÛÕÔÒÐÙâÕ ãÚÐ×ÐÝØâÕ ØÝáâàãÚæØØ. "
#: clientgui/BOINCBaseView.cpp:459
#: clientgui/BOINCBaseView.cpp:457
msgid "Web sites"
msgstr "Web áÐÙâÞÒÕ"
@ -498,31 +498,31 @@ msgstr ""
msgid "You are now successfully attached to this account manager."
msgstr "ÃáßÕèÝÞ ãáßïåâÕ ÔÐ áÕ ßàØÚàÕßØâÕ ÚêÜ âÞ×Ø ÐÚÐãÝâ ÜÕÝÐÖÕà. "
#: clientgui/DlgAbout.cpp:92
#: clientgui/DlgAbout.cpp:93
#, c-format
msgid "About %s"
msgstr "¾âÝÞáÝÞ %s"
#: clientgui/DlgAbout.cpp:98
#: clientgui/DlgAbout.cpp:99
#, c-format
msgid "%s"
msgstr "%s"
#: clientgui/DlgAbout.cpp:133
#: clientgui/DlgAbout.cpp:138
#: clientgui/WizardAccountManager.cpp:130
#: clientgui/WizardAttachProject.cpp:141
msgid "BOINC Manager"
msgstr "BOINC Manager"
#: clientgui/DlgAbout.cpp:152
#: clientgui/DlgAbout.cpp:157
msgid "Version:"
msgstr "²ÕàáØï: "
#: clientgui/DlgAbout.cpp:160
#: clientgui/DlgAbout.cpp:165
msgid "Copyright:"
msgstr "Copyright:"
#: clientgui/DlgAbout.cpp:164
#: clientgui/DlgAbout.cpp:169
msgid ""
"(C) 2003-2006 University of California at Berkeley.\n"
"All Rights Reserved."
@ -530,15 +530,15 @@ msgstr ""
"(C) 2003-2006 ºÐÛØäÞàÝØÙáÚØï ÃÝØÒÕàáØâÕâ Ò ±êàÚÛØ.\n"
"²áØçÚØ ßàÐÒÐ ×ÐßÐ×ÕÝØ."
#: clientgui/DlgAbout.cpp:168
#: clientgui/DlgAbout.cpp:173
msgid "Berkeley Open Infrastructure for Network Computing"
msgstr "Berkeley Open Infrastructure for Network Computing"
#: clientgui/DlgAbout.cpp:172
#: clientgui/DlgAbout.cpp:177
msgid "A software platform for distributed computing using volunteered computer resources"
msgstr "ÁÞäâãàÝÐ ßÛÐâäÞàÜÐ ×Ð àÐ×ßàÕÔÕÛÕÝÞ Ø×çØáÛÕÝØÕ, Ø×ßÞÛ×ÒÐÙÚØ ÚÞÜßîâêàÝØâÕ àÕáãàáØ ÝÐ ÔÞÑàÞÒÞÛæØ. "
#: clientgui/DlgAbout.cpp:184
#: clientgui/DlgAbout.cpp:189
#: clientgui/DlgDialupCredentials.cpp:136
#: clientgui/DlgGenericMessage.cpp:122
#: clientgui/DlgOptions.cpp:324
@ -1407,7 +1407,7 @@ msgstr "'%s'
msgid "'%s' does not contain a valid path."
msgstr "'%s' ÝÕ áêÔêàÖÐ ÒÐÛØÔÕÝ ßêâ. "
#: clientgui/ViewMessages.cpp:74
#: clientgui/ViewMessages.cpp:78
#: clientgui/ViewProjects.cpp:102
#: clientgui/ViewStatistics.cpp:637
#: clientgui/ViewTransfers.cpp:92
@ -1415,23 +1415,23 @@ msgstr "'%s'
msgid "Commands"
msgstr "&ºÞÜÐÝÔØ"
#: clientgui/ViewMessages.cpp:78
#: clientgui/ViewMessages.cpp:82
msgid "Copy all messages"
msgstr "ºÞßØàÐÙ ÒáØçÚØ áêÞÑéÕÝØï"
#: clientgui/ViewMessages.cpp:79
#: clientgui/ViewMessages.cpp:83
msgid "Copy all the messages to the clipboard."
msgstr "ºÞßØàÐ ÒáØçÚØ áêÞÑéÕÝØï Ò clipboard."
#: clientgui/ViewMessages.cpp:85
#: clientgui/ViewMessages.cpp:89
msgid "Copy selected messages"
msgstr "ºÞßØàÐÙ Ø×ÑàÐÝØâÕ áêÞÑéÕÝØï"
#: clientgui/ViewMessages.cpp:86
#: clientgui/ViewMessages.cpp:90
msgid "Copy the selected messages to the clipboard. You can select multiple messages by holding down the shift or control key while clicking on messages."
msgstr "ºÞßØàÐ Ø×ÑàÐÝØâÕ áêÞÑéÕÝØï Ò clipboard. ¼ÞÖÕ ÔÐ Ø×ÑÕàÕâÕ ÝïÚÞÚÞ áêÞÑéÕÝØï ÚÐâÞ ×ÐÔêàÖØâÕ ÚÛÐÒØèÐ Shift ØÛØ Ctrl, ÔÞÚÐâÞ ÚÛØÚÐâÕ ÝÐ áêÞÑéÕÝØïâÐ."
#: clientgui/ViewMessages.cpp:98
#: clientgui/ViewMessages.cpp:102
#: clientgui/ViewProjects.cpp:150
#: clientgui/ViewResources.cpp:76
#: clientgui/ViewStatistics.cpp:668
@ -1440,23 +1440,23 @@ msgstr "
msgid "Project"
msgstr "¿àÞÕÚâ"
#: clientgui/ViewMessages.cpp:99
#: clientgui/ViewMessages.cpp:103
msgid "Time"
msgstr "²àÕÜÕ"
#: clientgui/ViewMessages.cpp:100
#: clientgui/ViewMessages.cpp:104
msgid "Message"
msgstr "ÁêÞÑéÕÝØÕ"
#: clientgui/ViewMessages.cpp:124
#: clientgui/ViewMessages.cpp:128
msgid "Messages"
msgstr "ÁêÞÑéÕÝØï"
#: clientgui/ViewMessages.cpp:146
#: clientgui/ViewMessages.cpp:150
msgid "Copying all messages to the clipboard..."
msgstr "ºÞßØàÐÝÕ ÝÐ ÒáØçÚØ áêÞÑéÕÝØï Ò clipboard..."
#: clientgui/ViewMessages.cpp:178
#: clientgui/ViewMessages.cpp:182
#: clientgui/ViewTransfers.cpp:185
msgid "Aborting transfer..."
msgstr "¿àÕãáâÐÝÞÒïÒÐÝÕ ÝÐ âàÐÝáäÕàÐ..."
@ -1472,7 +1472,7 @@ msgstr "
#: clientgui/ViewProjects.cpp:114
#: clientgui/ViewProjects.cpp:564
#: clientgui/ViewWork.cpp:111
#: clientgui/ViewWork.cpp:490
#: clientgui/ViewWork.cpp:517
msgid "Suspend"
msgstr "²àÕÜÕÝÝÞ ßàÕÚàÐâïÒÐÝÕ"
@ -1579,12 +1579,12 @@ msgid "Detach from Project"
msgstr "¸×ÛÕ× Þâ ßàÞÕÚâÐ"
#: clientgui/ViewProjects.cpp:375
#: clientgui/ViewWork.cpp:295
#: clientgui/ViewWork.cpp:319
msgid "Launching browser..."
msgstr "ÁâÐàâØàÐÝÕ ÝÐ ÑàÐã×êàÐ..."
#: clientgui/ViewProjects.cpp:560
#: clientgui/ViewWork.cpp:486
#: clientgui/ViewWork.cpp:511
msgid "Resume"
msgstr "¿ÞÔÝÞÒïÒÐÝÕ"
@ -1605,7 +1605,7 @@ msgid "Don't fetch new tasks for this project."
msgstr "½Õ Ò×ØÜÐÙ ÝÞÒØ ×ÐÔÐçØ ×Ð âÞ×Ø ßàÞÕÚâ."
#: clientgui/ViewProjects.cpp:678
#: clientgui/ViewWork.cpp:707
#: clientgui/ViewWork.cpp:753
msgid "Suspended by user"
msgstr "¿àÕãáâÐÝÞÒÕÝÞ Þâ ßÞâàÑØâÕÛï"
@ -1768,12 +1768,12 @@ msgid "Retry in "
msgstr "½ÞÒ ÞßØâ áÛÕÔ "
#: clientgui/ViewTransfers.cpp:527
#: clientgui/ViewWork.cpp:695
#: clientgui/ViewWork.cpp:741
msgid "Download failed"
msgstr "ÁÒÐÛïÝÕâÞ ÝÕãáßÕèÝÞ"
#: clientgui/ViewTransfers.cpp:529
#: clientgui/ViewWork.cpp:734
#: clientgui/ViewWork.cpp:780
msgid "Upload failed"
msgstr "¸×ßàÐéÐÝÕâÞ ÝÕãáßÕèÝÞ"
@ -1783,12 +1783,12 @@ msgid "Suspended"
msgstr "²àÕÜÕÝÝÞ ßàÕÚàÐâÕÝÞ"
#: clientgui/ViewTransfers.cpp:535
#: clientgui/ViewWork.cpp:736
#: clientgui/ViewWork.cpp:782
msgid "Uploading"
msgstr "¸×ßàÐéÐÝÕ"
#: clientgui/ViewTransfers.cpp:535
#: clientgui/ViewWork.cpp:697
#: clientgui/ViewWork.cpp:743
msgid "Downloading"
msgstr "ÁÒÐÛïÝÕ"
@ -1802,10 +1802,14 @@ msgstr "
#: clientgui/ViewWork.cpp:104
#: clientgui/ViewWork.cpp:213
#: clientgui/ViewWork.cpp:532
#: clientgui/ViewWork.cpp:540
msgid "Show graphics"
msgstr "¿ÞÚÐÖØ ÓàÐäØÚØ"
#: clientgui/ViewWork.cpp:105
#: clientgui/ViewWork.cpp:533
#: clientgui/ViewWork.cpp:541
msgid "Show application graphics in a window."
msgstr "¿ÞÚÐ×ÒÐ ÓàÐäØÚØâÕ Ò ßàÞ×ÞàÕæ. "
@ -1843,7 +1847,7 @@ msgstr "
#: clientgui/ViewWork.cpp:150
msgid "Tasks"
msgstr "·ÐÔÐçØ"
msgstr "¾ßæØØ"
#: clientgui/ViewWork.cpp:175
msgid "Resuming task..."
@ -1861,75 +1865,87 @@ msgstr "
msgid "Are you sure you want to display graphics on a remote machine?"
msgstr "ÁØÓãàÝØ ÛØ áâÕ çÕ ØáÚÐâÕ ÔÐ ßÞÚÐ×ÒÐâÕ ÓàÐäØÚØ ÝÐ ÞâÔÐÛÕçÕÝÐ ÜÐèØÝÐ?"
#: clientgui/ViewWork.cpp:258
#: clientgui/ViewWork.cpp:274
msgid "Aborting result..."
msgstr "¿àÕãáâÐÝÞÒïÒÐÝÕ ÝÐ àÕ×ãÛâÐâÐ..."
#: clientgui/ViewWork.cpp:261
#: clientgui/ViewWork.cpp:282
#, c-format
msgid "Are you sure you want to abort this task '%s'?"
msgstr "ÁØÓãàÝØ ÛØ áâÕ, çÕ ØáÚÐâÕ ÔÐ ßàÕÚàÐâØâÕ âÐ×Ø ×ÐÔÐçÐ '%s'?"
msgid ""
"Are you sure you want to abort this task '%s'?\n"
"(Progress: %s, Status: %s)"
msgstr ""
"ÁØÓãàÝØ ÛØ áâÕ, çÕ ØáÚÐâÕ ÔÐ ßàÕãáâÐÝÞÒØè âÐ×Ø ×ÐÔÐçÐ '%s'?\n"
"(¿àÞÓàÕá: %s, ÁâÐâãá: %s)"
#: clientgui/ViewWork.cpp:267
#: clientgui/ViewWork.cpp:291
msgid "Abort task"
msgstr "¿àÕÚàÐâØ ×ÐÔÐçÐâÐ"
#: clientgui/ViewWork.cpp:486
#: clientgui/ViewWork.cpp:512
msgid "Resume work for this task."
msgstr "¿ÞÔÝÞÒïÒÐ àÐÑÞâÐâÐ ßÞ âÐ×Ø ×ÐÔÐçÐ. "
#: clientgui/ViewWork.cpp:490
#: clientgui/ViewWork.cpp:518
msgid "Suspend work for this task."
msgstr "²àÕÜÕÝÝÞ ßàÕÚàÐâïÒÐ àÐÑÞâÐâÐ ßÞ âÐ×Ø ×ÐÔÐçÐ. "
#: clientgui/ViewWork.cpp:691
#: clientgui/ViewWork.cpp:526
msgid "Hide graphics"
msgstr "ÁÚàØÙ ÓàÐäØÚØ"
#: clientgui/ViewWork.cpp:527
msgid "Hide application graphics window."
msgstr "ÁÚàØÒÐ ßàÞ×ÞàÕæÐ á ÓàÐäØÚØâÕ ÝÐ ßàØÛÞÖÕÝØÕâÞ. "
#: clientgui/ViewWork.cpp:737
msgid "New"
msgstr "½ÞÒÞ"
#: clientgui/ViewWork.cpp:703
#: clientgui/ViewWork.cpp:727
#: clientgui/ViewWork.cpp:749
#: clientgui/ViewWork.cpp:773
msgid "Aborted by user"
msgstr "¿àÕãáâÐÝÞÒÕÝÞ Þâ ßÞâàÕÑØâÕÛï"
#: clientgui/ViewWork.cpp:705
#: clientgui/ViewWork.cpp:751
msgid "Project suspended by user"
msgstr "¿àÞÕÚâêâ ßàÕãáâÐÝÞÒÕÝ Þâ ßÞâàÕÑØâÕÛï"
#: clientgui/ViewWork.cpp:709
#: clientgui/ViewWork.cpp:755
msgid "Activities suspended"
msgstr "´ÕÙÝÞáâØâÕ ÒàÕÜÕÝÝÞ ßàÕÚàÐâÕÝØ"
#: clientgui/ViewWork.cpp:712
#: clientgui/ViewWork.cpp:758
msgid "Running"
msgstr "ÀÐÑÞâØ"
#: clientgui/ViewWork.cpp:714
#: clientgui/ViewWork.cpp:760
msgid "Preempted"
msgstr "¸×çØáÛÕÝØïâÐ ÞâÛÞÖÕÝØ"
#: clientgui/ViewWork.cpp:716
#: clientgui/ViewWork.cpp:719
#: clientgui/ViewWork.cpp:762
#: clientgui/ViewWork.cpp:765
msgid "Ready to run"
msgstr "³ÞâÞÒÞ ×Ð àÐÑÞâÐ"
#: clientgui/ViewWork.cpp:729
#: clientgui/ViewWork.cpp:775
msgid "Computation error"
msgstr "³àÕèÚÐ ßàØ Ø×çØáÛÕÝØïâÐ"
#: clientgui/ViewWork.cpp:741
#: clientgui/ViewWork.cpp:787
msgid "Acknowledged"
msgstr "¿ÞâÒêàÔÕÝÞ"
#: clientgui/ViewWork.cpp:743
#: clientgui/ViewWork.cpp:789
msgid "Ready to report"
msgstr "³ÞâÞÒÞ ×Ð ÔÞÚÛÐÔÒÐÝÕ"
#: clientgui/ViewWork.cpp:745
#: clientgui/ViewWork.cpp:791
#, c-format
msgid "Error: invalid state '%d'"
msgstr "³àÕèÚÐ: ½ÕÒÐÛØÔÝÞ áêáâÞïÝØÕ '%d'"
#: clientgui/ViewWork.cpp:753
#: clientgui/ViewWork.cpp:799
msgid "Activities suspended by user"
msgstr "´ÕÙÝÞáâØâÕ ÒàÕÜÕÝÝÞ ßàÕÚàÐâÕÝØ Þâ ßÞâàÕÑØâÕÛï"