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

diff --git a/include/anna/core/functions.hpp b/include/anna/core/functions.hpp
index 177e5be..b2a24ab 100644
--- a/include/anna/core/functions.hpp
+++ b/include/anna/core/functions.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// 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
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #ifndef anna_core_functions_hpp
@@ -127,15 +99,25 @@ struct functions {
 
   /**
      \param number Numero a convertir.
-     @return Un literal con el numero convertido a cadena decimal.
+     @return Un literal con el numero sin signo convertido a cadena decimal.
   */
-  static std::string asString(const unsigned long number) throw();
+  static std::string asString(const unsigned int number) throw();
 
   /**
      \param number Numero a convertir.
      @return Un literal con el numero sin signo convertido a cadena decimal.
   */
-  static std::string asString(const unsigned int number) throw();
+  static std::string asString(const unsigned long long int number) throw() {
+    return asString((U64)number);
+  }
+
+  /**
+     \param number Numero a convertir.
+     @return Un literal con el numero sin signo convertido a cadena decimal.
+  */
+  static std::string asString(const long long int number) throw() {
+    return asString((S64)number);
+  }
 
   /**
      Devuelve un literal con tel numero convertido a cadena decimal
@@ -260,12 +242,6 @@ struct functions {
   */
   static std::string asHexString(const S64 number) throw();
 
-  /**
-     \param number Numero a convertir.
-     @return Un literal con el numero convertido a cadena hexadecimal.
-  */
-  static std::string asHexString(const long number) throw();
-
   /**
      \param number Numero a convertir.
      @return Un literal con el numero convertido a cadena hexadecimal.
@@ -441,7 +417,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 +493,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);
   }