[med-svn] [freecontact] 01/03: Imported Upstream version 1.0.20
Laszlo Kajan
lkajan at alioth.debian.org
Thu Sep 19 16:45:33 UTC 2013
This is an automated email from the git hooks/post-receive script.
lkajan pushed a commit to branch master
in repository freecontact.
commit b0f9cb015d18544bae33889e85b52bf9aaef0a95
Author: Laszlo Kajan <lkajan at debian.org>
Date: Thu Sep 19 18:35:58 2013 +0200
Imported Upstream version 1.0.20
---
ChangeLog | 7 +++++++
configure | 20 ++++++++++----------
configure.ac | 2 +-
lib/config.h | 6 +++---
lib/freecontact.cpp | 12 +++++++++---
5 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ee7034a..aa0e5fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+freecontact (1.0.20) unstable; urgency=low
+
+ * Fixed runtime issues with timer_create(CLOCK_PROCESS_CPUTIME_ID,...) on
+ kfreebsd.
+
+ -- Laszlo Kajan <lkajan at rostlab.org> Thu, 19 Sep 2013 18:26:56 +0200
+
freecontact (1.0.19) unstable; urgency=low
* Changed the condition on which x86intrin.h is included.
diff --git a/configure b/configure
index e0ab871..04ab1ab 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for freecontact 1.0.19.
+# Generated by GNU Autoconf 2.69 for freecontact 1.0.20.
#
# Report bugs to <lkajan at rostlab.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='freecontact'
PACKAGE_TARNAME='freecontact'
-PACKAGE_VERSION='1.0.19'
-PACKAGE_STRING='freecontact 1.0.19'
+PACKAGE_VERSION='1.0.20'
+PACKAGE_STRING='freecontact 1.0.20'
PACKAGE_BUGREPORT='lkajan at rostlab.org'
PACKAGE_URL=''
@@ -1424,7 +1424,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures freecontact 1.0.19 to adapt to many kinds of systems.
+\`configure' configures freecontact 1.0.20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1494,7 +1494,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of freecontact 1.0.19:";;
+ short | recursive ) echo "Configuration of freecontact 1.0.20:";;
esac
cat <<\_ACEOF
@@ -1643,7 +1643,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-freecontact configure 1.0.19
+freecontact configure 1.0.20
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2331,7 +2331,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by freecontact $as_me 1.0.19, which was
+It was created by freecontact $as_me 1.0.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3199,7 +3199,7 @@ fi
# Define the identity of the package.
PACKAGE='freecontact'
- VERSION='1.0.19'
+ VERSION='1.0.20'
cat >>confdefs.h <<_ACEOF
@@ -28681,7 +28681,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by freecontact $as_me 1.0.19, which was
+This file was extended by freecontact $as_me 1.0.20, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -28747,7 +28747,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-freecontact config.status 1.0.19
+freecontact config.status 1.0.20
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 46b8f90..c42619d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-AC_INIT([freecontact], [1.0.19], [lkajan at rostlab.org])
+AC_INIT([freecontact], [1.0.20], [lkajan at rostlab.org])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([src/freecontact.cpp])
diff --git a/lib/config.h b/lib/config.h
index b5183eb..651c978 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -103,7 +103,7 @@
#define PACKAGE_NAME "freecontact"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "freecontact 1.0.19"
+#define PACKAGE_STRING "freecontact 1.0.20"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "freecontact"
@@ -112,7 +112,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.19"
+#define PACKAGE_VERSION "1.0.20"
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -122,4 +122,4 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.19"
+#define VERSION "1.0.20"
diff --git a/lib/freecontact.cpp b/lib/freecontact.cpp
index 4dbf84f..e7e6c86 100644
--- a/lib/freecontact.cpp
+++ b/lib/freecontact.cpp
@@ -202,14 +202,20 @@ class _glasso_timer {
_glasso_timer(const _glasso_timer&){}
_glasso_timer& operator=(const _glasso_timer&){return *this;}
public:
- _glasso_timer(int *__sival_ptr, time_t __tv_sec)
+ bool dbg;
+ _glasso_timer(int *__sival_ptr, time_t __tv_sec, bool __dbg = false) : dbg(__dbg)
{
struct sigevent sev;
sev.sigev_notify = SIGEV_THREAD;
sev.sigev_notify_function = _brk;
sev.sigev_value.sival_ptr = __sival_ptr;
sev.sigev_notify_attributes = NULL;
- if (timer_create(CLOCK_PROCESS_CPUTIME_ID, &sev, &_timerid) == -1) throw std::runtime_error(bo::str(bo::format("%s at %s:%d") % strerror(errno) % __FILE__ % __LINE__ ));
+ if (timer_create(CLOCK_PROCESS_CPUTIME_ID, &sev, &_timerid) == -1)
+ {
+ if (dbg) cerr << "timer_create(CLOCK_PROCESS_CPUTIME_ID, ...): " << strerror(errno) << " at " << __FILE__ << ":" << __LINE__ << "\n";
+ // In case timer_create fails with CLOCK_PROCESS_CPUTIME_ID because clock_getcpuclockid() is not supported (e.g. on kfreebsd):
+ if (timer_create(CLOCK_MONOTONIC, &sev, &_timerid) == -1) throw std::runtime_error(bo::str(bo::format("%s at %s:%d") % strerror(errno) % __FILE__ % __LINE__ ));
+ }
struct itimerspec its;
its.it_value.tv_sec = __tv_sec;
its.it_value.tv_nsec = 0;
@@ -768,7 +774,7 @@ predictor::cont_res_t
{
// Set up a timer to break this process if it overruns some process cputime limit
- _glasso_timer _gt(&g_brk, __icme_timeout);
+ _glasso_timer _gt(&g_brk, __icme_timeout, dbg);
// No need to transpose for Fortran, matrix is symmetric.
{
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/freecontact.git
More information about the debian-med-commit
mailing list