Source reorganization. In short:

  * Added directories and moved related files into them:
      - src for the MPFR source files (to build the library).
      - doc for documentation files (except INSTALL, README...).
      - tools for various tools (scripts) and mbench.
      - tune for tuneup-related source files.
      - other for other source files (not distributed in tarballs).
    Existing directories:
      - tests for the source files of the test suite (make check).
      - examples for examples.
      - m4 for m4 files.
  * Renamed configure.in to configure.ac.
  * Added/updated Makefile.am files where needed.
  * Updated acinclude.m4 and configure.ac (AC_CONFIG_FILES line).
  * Updated the documentation (INSTALL, README, doc/README.dev and
    doc/mpfr.texi).
  * Updated NEWS and TODO.
  * Updated the scripts now in tools.

The following script was used:

#!/usr/bin/env zsh
svn mkdir doc other src tools tune
svn mv ${${(M)$(sed -n '/libmpfr_la_SOURCES/,/[^\]$/p' \
         Makefile.am):#*.[ch]}:#get_patches.c} mparam_h.in \
       round_raw_generic.c jyn_asympt.c src
svn mv mbench check_inits_clears coverage get_patches.sh mpfrlint \
  nightly-test update-patchv update-version tools
svn mv bidimensional_sample.c speed.c tuneup.c tune
svn mv *.{c,h} other
svn mv FAQ.html README.dev algorithm* faq.xsl fdl.texi mpfr.texi \
  update-faq doc
svn mv configure.in configure.ac
svn cp Makefile.am src/Makefile.am
svn rm replace_all
[Modifying some files, see above]
svn add doc/Makefile.am
svn add tune/Makefile.am

git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@7087 280ebfd0-de03-0410-8827-d642c229c3f4

1 files changed, 165 insertions, 0 deletions

diff --git a/src/logging.c b/src/logging.c
new file mode 100644
index 000000000..19116abdc
--- /dev/null
+++ b/src/logging.c
@@ -0,0 +1,165 @@
+/* MPFR Logging functions.
+
+Copyright 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Contributed by the Arenaire and Caramel projects, INRIA.
+
+This file is part of the GNU MPFR Library.
+
+The GNU MPFR Library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+The GNU MPFR Library 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 Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the GNU MPFR Library; see the file COPYING.LESSER.  If not, see
+http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#include "mpfr-impl.h"
+
+/* Logging MPFR needs GCC >= 3.0 and GLIBC >= 2.0. */
+
+#ifdef MPFR_USE_LOGGING
+
+/* Can't include them before (in particular, printf.h) */
+#include <stdlib.h>
+#include <printf.h>
+#include <stdarg.h>
+#include <time.h>
+
+/* Define LOGGING variables */
+
+FILE *mpfr_log_file;
+int   mpfr_log_type;
+int   mpfr_log_level;
+int   mpfr_log_base;
+int   mpfr_log_current;
+int   mpfr_log_worstcase_limit;
+mpfr_prec_t mpfr_log_prec;
+
+static int
+mpfr_printf_mpfr_print (FILE *stream, const struct printf_info *info,
+                        const void * const *arg)
+{
+  int length;
+  int org_type_logging;
+
+  /* TODO: Use much more flag from info  */
+  mpfr_srcptr w = *((mpfr_srcptr *) (arg[0]));
+  mpfr_prec_t prec = mpfr_log_prec != 0 ? mpfr_log_prec
+    : info->width == -1 ? 0 : (mpfr_prec_t) info->width;
+
+  org_type_logging = mpfr_log_type;
+  mpfr_log_type = 0; /* We disable the logging during this print! */
+  if (info->alt)
+    length = fprintf (stream, "%lu", (unsigned long) MPFR_PREC (w));
+  else
+    length = mpfr_out_str (stream, mpfr_log_base, prec, w, MPFR_RNDN);
+  mpfr_log_type = org_type_logging;
+
+  return length;
+}
+
+static int
+mpfr_printf_mpfr_arginfo (const struct printf_info *info, size_t n,
+                          int *argtypes)
+{
+  if (n > 0)
+    argtypes[0] = PA_POINTER;
+  return 1;
+}
+
+static void mpfr_log_begin (void) __attribute__((constructor));
+
+/* We let the system close the LOG itself
+   (Otherwise functions called by destructor can't use LOG File */
+static void
+mpfr_log_begin (void)
+{
+  const char *var;
+  time_t tt;
+
+  /* Grab some information */
+  var = getenv ("MPFR_LOG_BASE");
+  mpfr_log_base = var == NULL || *var == 0 ? 10 : atoi (var);
+
+  var = getenv ("MPFR_LOG_LEVEL");
+  mpfr_log_level = var == NULL || *var == 0 ? 7 : atoi (var);
+  mpfr_log_current = 0;
+
+  var = getenv ("MPFR_LOG_PREC");
+  mpfr_log_prec = var == NULL || *var == 0 ? 0 : atol (var);
+
+  /* Get what we need to log */
+  mpfr_log_type = 0;
+  if (getenv ("MPFR_LOG_INPUT") != NULL)
+    mpfr_log_type |= MPFR_LOG_INPUT_F;
+  if (getenv ("MPFR_LOG_OUTPUT") != NULL)
+    mpfr_log_type |= MPFR_LOG_OUTPUT_F;
+  if (getenv ("MPFR_LOG_TIME") != NULL)
+    mpfr_log_type |= MPFR_LOG_TIME_F;
+  if (getenv ("MPFR_LOG_INTERNAL") != NULL)
+    mpfr_log_type |= MPFR_LOG_INTERNAL_F;
+  if (getenv ("MPFR_LOG_MSG") != NULL)
+    mpfr_log_type |= MPFR_LOG_MSG_F;
+  if (getenv ("MPFR_LOG_ZIV") != NULL)
+    mpfr_log_type |= MPFR_LOG_BADCASE_F;
+  if (getenv ("MPFR_LOG_STAT") != NULL)
+    mpfr_log_type |= MPFR_LOG_STAT_F;
+  if (getenv ("MPFR_LOG_ALL") != NULL)
+    mpfr_log_type = MPFR_LOG_INPUT_F|MPFR_LOG_OUTPUT_F|MPFR_LOG_TIME_F
+      |MPFR_LOG_INTERNAL_F|MPFR_LOG_MSG_F|MPFR_LOG_BADCASE_F|MPFR_LOG_STAT_F;
+
+  /* Register printf functions */
+  register_printf_function ('R', mpfr_printf_mpfr_print,
+                            mpfr_printf_mpfr_arginfo);
+
+  /* Open filename if needed */
+  var = getenv ("MPFR_LOG_FILE");
+  if (var == NULL || *var == 0)
+    var = "mpfr.log";
+  if (mpfr_log_type != 0)
+    {
+      mpfr_log_file = fopen (var, "w");
+      if (mpfr_log_file == NULL)
+        {
+          fprintf (stderr, "MPFR LOG: Can't open '%s' with w.\n", var);
+          abort ();
+        }
+      time (&tt);
+      fprintf (mpfr_log_file, "MPFR LOG FILE %s\n", ctime (&tt));
+    }
+}
+
+/* Return user CPU time measured in milliseconds. Thanks to Torbjorn. */
+
+#if defined (ANSIONLY) || defined (USG) || defined (__SVR4) \
+ || defined (_UNICOS) || defined(__hpux)
+
+int
+mpfr_get_cputime (void)
+{
+  return (int) ((unsigned long long) clock () * 1000 / CLOCKS_PER_SEC);
+}
+
+#else /* Use getrusage for cputime */
+
+#include <sys/types.h>
+#include <sys/resource.h>
+
+int
+mpfr_get_cputime (void)
+{
+  struct rusage rus;
+  getrusage (0, &rus);
+  return rus.ru_utime.tv_sec * 1000 + rus.ru_utime.tv_usec / 1000;
+}
+
+#endif /* cputime */
+
+#endif /* MPFR_USE_LOGGING */