view lib/times.c @ 14853:bdc85db78f47

strerror: drop strerror_r dependency Since the errno module is responsible for introducing replacement errno values, it should also be responsible for translating those new values into strings. And by moving the replacements into a file managed by the errno, we can then break the dependency between strerror and strerror_r, so that strerror no longer drags in multi-threading modules required by strerror_r. Tested on glibc with: gl_cv_header_errno_h_complete=no gl_cv_func_working_strerror=no \ gl_cv_func_strerror_r_works=no ./gnulib-tool --with-tests \ --test strerror strerror_r-posix * lib/strerror_r.c (strerror_r): Move gnulib replacement strings... * lib/strerror-override.c (strerror_override): ...to new file. * lib/strerror-override.h: Add prototype. * lib/strerror-impl.h: Delete. * lib/strerror.c (strerror): New implementation. * modules/errno (Files): Add new files. (configure.ac): Compile new file as appropriate. * modules/strerror (Files): Drop unused file. (Depends-on): Drop strerror_r-posix. * MODULES.html.sh: Document strerror_r-posix. Requested by Sam Steingold. Signed-off-by: Eric Blake <eblake@redhat.com>
author Eric Blake <eblake@redhat.com>
date Tue, 24 May 2011 15:33:49 -0600
parents 97fc9a21a8fb
children 8250f2777afc
line wrap: on
line source

/* Get process times

   Copyright (C) 2008-2011 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

/* Written by Simon Josefsson <simon@josefsson.org>, 2008.  */

#include <config.h>

/* Get times prototype. */
#include <sys/times.h>

/* Get round. */
#include <math.h>

/* Get GetProcessTimes etc. */
#include <windows.h>

static clock_t
filetime2clock (FILETIME time)
{
  float f;

  /* We have a 64-bit value, in the form of two DWORDS aka unsigned
     int, counting the number of 100-nanosecond intervals.  We need to
     convert these to clock ticks.  Older POSIX uses CLK_TCK to
     indicate the number of clock ticks per second while modern POSIX
     uses sysconf(_SC_CLK_TCK).  Mingw32 does not appear to have
     sysconf(_SC_CLK_TCK), but appears to have CLK_TCK = 1000 so we
     use it.  Note that CLOCKS_PER_SEC constant does not apply here,
     it is for use with the clock function.  */

  f = (unsigned long long) time.dwHighDateTime << 32;
  f += time.dwLowDateTime;
  f = f * CLK_TCK / 10000000;
  return (clock_t) round (f);
}

clock_t
times (struct tms * buffer)
{
  FILETIME creation_time, exit_time, kernel_time, user_time;

  if (GetProcessTimes (GetCurrentProcess (), &creation_time, &exit_time,
                       &kernel_time, &user_time) == 0)
    return (clock_t) -1;

  buffer->tms_utime = filetime2clock (user_time);
  buffer->tms_stime = filetime2clock (kernel_time);
  buffer->tms_cutime = 0;
  buffer->tms_cstime = 0;

  return filetime2clock (creation_time);
}