From ff2a653dc30abec3815f0913f41164996fa13ed7 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 10 Sep 2005 04:37:27 +0000 Subject: [PATCH] graphics lib link error fix svn path=/trunk/boinc/; revision=7959 --- api/graphics_impl_lib.C | 26 ++++++++++++++++++++++++++ checkin_notes | 9 +++++++++ clientgui/ViewProjects.cpp | 13 ++++++------- doc/download_other.php | 2 +- doc/stats_sites.php | 2 +- doc/web_rpc.php | 2 +- 6 files changed, 44 insertions(+), 10 deletions(-) diff --git a/api/graphics_impl_lib.C b/api/graphics_impl_lib.C index 4cc498f0f1..7d8f9232b6 100644 --- a/api/graphics_impl_lib.C +++ b/api/graphics_impl_lib.C @@ -31,4 +31,30 @@ bool boinc_is_standalone() { return g_bmsp->boinc_is_standalone_hook(); } +// The following is a duplicate of function in boinc_api.C + +#include +#include +#include +#ifndef _WIN32 +// block SIGALRM, so that the worker thread will be forced to handle it +// +void block_sigalrm() { + sigset_t mask; + sigemptyset(&mask); + sigaddset(&mask, SIGALRM); + + // many current Linux machines don't have pthread_sigmask in their + // library. On these machines, sigprocmask() is equivalent. But + // in the long run (end of 2006??) one should eliminate sigprocmask + // and just use pthread_sigmask(). + // +#ifdef linux + sigprocmask(SIG_BLOCK, &mask, NULL); +#else + pthread_sigmask(SIG_BLOCK, &mask, NULL); +#endif +} +#endif + const char *BOINC_RCSID_9886dee259 = "$Id$"; diff --git a/checkin_notes b/checkin_notes index 6de136f88f..15183b0d05 100755 --- a/checkin_notes +++ b/checkin_notes @@ -11569,3 +11569,12 @@ David 9 Sept 2005 account_finish_action.php lib/ util.C + +David 9 Sept 2005 + - add block_sigalrm() to graphics_impl_lib.C + - fix some text in Manager + + api/ + graphics_impl_lib.C + clientgui/ + ViewProjects.cpp diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp index 1880d1a1dc..a16e7b6d05 100644 --- a/clientgui/ViewProjects.cpp +++ b/clientgui/ViewProjects.cpp @@ -114,8 +114,8 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) : pGroup->m_Tasks.push_back( pItem ); pItem = new CTaskItem( - _("Update All"), - _("Report all upload items, completed work, get latest credit, " + _("Update all"), + _("Report completed work, get latest credit, " "get latest preferences, and possibly get more work."), ID_TASK_PROJECT_UPDATE_ALL ); @@ -130,7 +130,7 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) : pItem = new CTaskItem( _("No new work"), - _("Don't fetch new work for this project."), + _("Don't get new work for this project."), ID_TASK_PROJECT_NONEWWORK ); pGroup->m_Tasks.push_back( pItem ); @@ -147,10 +147,9 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) : pItem = new CTaskItem( _("Detach"), - _("Detach this computer from this project. " - "Work in progress will be lost. " - "You can update the project first to report " - "any completed work."), + _("Detach computer from this project. " + "Work in progress will be lost " + "(use 'Update' first to report any completed work)."), ID_TASK_PROJECT_DETACH ); pGroup->m_Tasks.push_back( pItem ); diff --git a/doc/download_other.php b/doc/download_other.php index a494402860..963ea2d086 100644 --- a/doc/download_other.php +++ b/doc/download_other.php @@ -56,7 +56,7 @@ list_item_array(array( list_item_array(array( "SETI-Linux", "Linux i686, linux athlon xp, Linux AMD64, - Linux Pentium 3. Some Links to other Plattforms", + Linux Pentium 3. Some Links to other Platforms", "BOINC, SETI@home" )); list_item_array(array( diff --git a/doc/stats_sites.php b/doc/stats_sites.php index baa850d42c..766b082fef 100644 --- a/doc/stats_sites.php +++ b/doc/stats_sites.php @@ -25,7 +25,7 @@ Use these in your email or message-board signature.
  • http://www.boinc.dk/index.php?page=signatures -http://www.bigbee.be/comp/boinc/signature.php?id=9 (for members of boinc.de) +http://www.bigbee.be/comp/boinc/signature.php "; diff --git a/doc/web_rpc.php b/doc/web_rpc.php index 209a25a779..35b4de8a6f 100644 --- a/doc/web_rpc.php +++ b/doc/web_rpc.php @@ -175,7 +175,7 @@ or ") ); list_item("action", - "Returns into about an account. + "Returns info about an account. If called with the account key, returns a list of hosts associated with the account." );