X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Ffunctions.hpp;h=164417b126eb7c749deff35647522f274a754fce;hb=5256cb543a9d35b610df19bd227cde977186aef0;hp=177e5be23d3dc6b150581d22c7699e5676ccfe01;hpb=884501d2411bc4fdfafae65948262c959e068d7d;p=anna.git

diff --git a/include/anna/core/functions.hpp b/include/anna/core/functions.hpp
index 177e5be..164417b 100644
--- a/include/anna/core/functions.hpp
+++ b/include/anna/core/functions.hpp
@@ -1,8 +1,8 @@
-// ANNA - Anna is Not 'N' Anymore
+// ANNA - Anna is Not Nothingness Anymore
 //
 // (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
 //
-// https://bitbucket.org/testillano/anna
+// http://redmine.teslayout.com/projects/anna-suite
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -14,7 +14,7 @@
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
 // distribution.
-//     * Neither the name of Google Inc. nor the names of its
+//     *  Neither the name of the copyright holder nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
@@ -441,7 +441,14 @@ struct functions {
   */
   static Microsecond hardwareClock() throw() {
     timespec ts;
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts);
+    //clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts); // DONT works (original)
+    //clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts); // DONT works
+    //clock_gettime(CLOCK_MONOTONIC, &ts); // works
+      // Note that CLOCK_MONOTONIC is subject to discontinuities from system time
+      //  adjustment in Linux. CLOCK_MONOTONIC_RAW was defined to get around this
+      //  (gets hardware time not adjusted by NTP).
+    clock_gettime(CLOCK_MONOTONIC_RAW, &ts); // works
+
     Microsecond result((Microsecond::type_t)1000000 * ts.tv_sec + ts.tv_nsec / 1000);
     return result;
   }
@@ -510,7 +517,7 @@ struct functions {
    * \return el número de bits necesarios para representar el valor recibido como parámetro.
    */
   static int bitsize(const S64 n) throw() {
-    register int aux = n >> intBitSize;
+    int aux = n >> intBitSize;
     return (aux != 0) ? (bitsize(aux) + intBitSize) : bitsize((int) n);
   }