From: alegrand Date: Wed, 2 Jun 2010 13:11:54 +0000 (+0000) Subject: Revert "Make gras compil with Visual C++." This commit is too large/unreadable. It... X-Git-Tag: v3_5~988 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/663f424beab193b084453ba397102844dcd5ed64 Revert "Make gras compil with Visual C++." This commit is too large/unreadable. It should be split and have a smaller payload. :) This reverts commit eae1f516d7042d8a589b3d4150cc2721dc146a24. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7820 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e5339115d4..e40adb6f0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,21 @@ set(libsimgrid_version "${release_version}") set(libgras_version "${release_version}") set(libsmpi_version "${release_version}") +if(WIN32) + message(" Be sure all those variables are correctely set.") + message(" -- C_COMPILER $ENV{CC}") + message(" -- CXX_COMPILER $ENV{CXX}") + message(" -- RC_COMPILER $ENV{RC}") + message(" -- INCLUDE $ENV{INCLUDE}") + message(" -- LIB $ENV{LIB}") + message(" -- MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}") + message(" -- CMAKE_BUILD_TOOL ${CMAKE_BUILD_TOOL}") + message(" -- LINKER ${CMAKE_LINKER}") + message(" -- CMAKE_GENERATOR ${CMAKE_GENERATOR}\n\n") + set(__STRICT_ANSI__ 1) + set(_MSC_VER 1) +endif(WIN32) + ### Find programs and paths find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS) find_path(VALGRIND_PATH NAMES valgrind PATHS NO_DEFAULT_PATHS) @@ -16,6 +31,7 @@ find_path(VALGRIND_PATH NAMES valgrind PATHS NO_DEFAULT_PATHS) SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}") ### Set some variables for Cmake +#SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src") #this one is evil since it speaks to CPack instead SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/src/") set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY}) @@ -25,28 +41,7 @@ if(EXISTS /usr/include/) endif(EXISTS /usr/include/) if(WIN32) - set(INCLUDES_MORE $ENV{INCLUDE}) - string(REPLACE "\\" "/" INCLUDES_MORE "${INCLUDES_MORE}") - foreach(include_dir ${INCLUDES_MORE}) - set(INCLUDES "${INCLUDES} -I\"${include_dir}\"") - endforeach(include_dir ${INCLUDES_MORE}) -endif(WIN32) - -if(WIN32) - message(" Be sure all those variables are correctely set.") - message(" -- C_COMPILER $ENV{CC}") - message(" -- CXX_COMPILER $ENV{CXX}") - message(" -- RC_COMPILER $ENV{RC}") - message(" -- INCLUDE $ENV{INCLUDE}") - message(" -- LIB $ENV{LIB}") - message(" -- MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM}") - message(" -- CMAKE_BUILD_TOOL ${CMAKE_BUILD_TOOL}") - message(" -- LINKER ${CMAKE_LINKER}") - message(" -- CMAKE_GENERATOR ${CMAKE_GENERATOR}\n\n") - message(" -- INCLUDES ${INCLUDES}") - set(__STRICT_ANSI__ 1) - set(_MSC_VER 1) - set(_WIN32 1) + set(INCLUDES "${INCLUDES} -I$ENV{INCLUDE}") endif(WIN32) if(enable_coverage) diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake index 90a5d50090..72fc89b303 100644 --- a/buildtools/Cmake/Flags.cmake +++ b/buildtools/Cmake/Flags.cmake @@ -1,8 +1,8 @@ set(warnCFLAGS "") set(optCFLAGS "") -if(NOT WIN32) set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS}-g3) + if(enable_supernovae) set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ") set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ") @@ -15,6 +15,6 @@ endif(enable_compile_warnings) if(enable_compile_optimizations) set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ") endif(enable_compile_optimizations) -endif(NOT WIN32) set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}") + diff --git a/buildtools/Cmake/gras_config.h.in b/buildtools/Cmake/gras_config.h.in index 1ef70eebb7..fccb7011d1 100644 --- a/buildtools/Cmake/gras_config.h.in +++ b/buildtools/Cmake/gras_config.h.in @@ -2,14 +2,8 @@ // With Cmake it creates /src/gras_config.h /* Set somes variables for Windows compilation */ -#ifndef __STRICT_ANSI__ - #cmakedefine __STRICT_ANSI__ @__STRICT_ANSI__@ -#endif -#ifndef _MSC_VER - #cmakedefine _MSC_VER @_MSC_VER@ -#endif -#cmakedefine _WIN32 @_WIN32@ -#cmakedefine WIN32 @WIN32@ +#cmakedefine __STRICT_ANSI__ @__STRICT_ANSI__@ +#cmakedefine _MSC_VER @_MSC_VER@ /* Set to true if enable_model-checking is true */ #cmakedefine MMALLOC_WANT_OVERIDE_LEGACY @MMALLOC_WANT_OVERIDE_LEGACY@ diff --git a/include/xbt/misc.h b/include/xbt/misc.h index 9964ea6f9e..5ee26611b4 100644 --- a/include/xbt/misc.h +++ b/include/xbt/misc.h @@ -1,195 +1,194 @@ -/* xbt.h - Public interface to the xbt (gras's toolbox) */ -/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#include "gras_config.h" - -#ifndef XBT_MISC_H -#define XBT_MISC_H - -/* Attributes are only in recent versions of GCC */ -#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)) -# define _XBT_GNUC_PRINTF( format_idx, arg_idx ) \ - __attribute__((__format__ (__printf__, format_idx, arg_idx))) -# define _XBT_GNUC_SCANF( format_idx, arg_idx ) \ - __attribute__((__format__ (__scanf__, format_idx, arg_idx))) -# define _XBT_GNUC_FORMAT( arg_idx ) \ - __attribute__((__format_arg__ (arg_idx))) -# define _XBT_GNUC_NORETURN __attribute__((__noreturn__)) -# define _XBT_GNUC_UNUSED __attribute__((unused)) -# define _XBT_GNUC_CONSTRUCTOR __attribute__((__constructor__)) -# define _XBT_GNUC_DESTRUCTOR __attribute__((__destructor__)) -# undef _XBT_NEED_INIT_PRAGMA - -#else /* !__GNUC__ */ -# define _XBT_GNUC_PRINTF( format_idx, arg_idx ) -# define _XBT_GNUC_SCANF( format_idx, arg_idx ) -# define _XBT_GNUC_FORMAT( arg_idx ) -# define _XBT_GNUC_NORETURN -# define _XBT_GNUC_UNUSED -# define _XBT_GNUC_CONSTRUCTOR -# define _XBT_GNUC_DESTRUCTOR -# define _XBT_NEED_INIT_PRAGMA 1 - -#endif /* !__GNUC__ */ - -/* inline and __FUNCTION__ are only in GCC when -ansi is off */ - -#if defined(__GNUC__) && ! defined(__STRICT_ANSI__) -# define _XBT_FUNCTION __FUNCTION__ -#elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) -# define _XBT_FUNC__ __func__ /* ISO-C99 compliant */ -#else -# define _XBT_FUNCTION "function" -#endif - -#ifndef __cplusplus -# if defined(__GNUC__) && ! defined(__STRICT_ANSI__) -# define XBT_INLINE inline -# elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) -# define XBT_INLINE inline -# elif defined(__BORLANDC__) && !defined(__STRICT_ANSI__) -# define XBT_INLINE __inline -# else -# define XBT_INLINE -# endif -# else -# define XBT_INLINE inline -#endif - -/* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */ -#ifdef MIN -# undef MIN -#endif -#define MIN(a,b) ((a)<(b)?(a):(b)) - -#ifdef MAX -# undef MAX -#endif -#define MAX(a,b) ((a)>(b)?(a):(b)) - - -/* - * Function calling convention (not used for now) - */ - -#ifdef _WIN32 -# ifndef _XBT_CALL -# define _XBT_CALL __cdecl -# endif -#else -# define _XBT_CALL -#endif - -/* Handle import/export stuff - * - * Rational of XBT_PUBLIC: - * * This is for library symbols visible from the application-land. - * Basically, any symbols defined in the include/directory must be - * like this (plus some other globals). - * - * UNIX coders should just think of it as a special way to say "extern". - * - * * If you build the DLL, define the DLL_EXPORT symbol so that all symbols - * actually get exported by this file. - - * * If you do a static windows compilation, define DLL_STATIC, both when - * compiling the application files and when compiling the library. - * - * * If you link your application against the DLL or if you do a UNIX build, - * don't do anything special. This file will do the right thing for you - * by default. - * - * - * Rational of XBT_EXPORT_NO_IMPORT: (windows-only cruft) - * * Symbols which must be exported in the DLL, but not imported from it. - * - * * This is obviously useful for initialized globals (which cannot be - * extern or similar). - * * This is also used in the log mecanism where a macro creates the - * variable automatically. When the macro is called from within SimGrid, - * the symbol must be exported, but when called from within the client - * code, it must not try to retrieve the symbol from the DLL since it's - * not in there. - * - * Rational of XBT_IMPORT_NO_EXPORT: (windows-only cruft) - * * Symbols which must be imported from the DLL, but not explicitely - * exported from it. - * - * * The root log category is already exported, but not imported explicitely - * when creating a subcategory since we cannot import the parent category - * to deal with the fact that the parent may be in application space, not - * DLL space. - */ - - -/* Build the DLL */ -#if defined(DLL_EXPORT) -# define XBT_PUBLIC(type) __declspec(dllexport) type -# define XBT_EXPORT_NO_IMPORT(type) __declspec(dllexport) type -# define XBT_IMPORT_NO_EXPORT(type) type -# define XBT_PUBLIC_DATA(type) __declspec(dllexport) type - -/* Pack everything up statically */ -#elif defined(DLL_STATIC) -# define XBT_PUBLIC(type) extern type -# define XBT_EXPORT_NO_IMPORT(type) type -# define XBT_IMPORT_NO_EXPORT(type) type -# define XBT_PUBLIC_DATA(type) extern type - - -/* Link against the DLL */ -#elif (defined(_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC)) -# define XBT_PUBLIC(type) type -# define XBT_EXPORT_NO_IMPORT(type) type -# define XBT_IMPORT_NO_EXPORT(type) __declspec(dllimport) type -# define XBT_PUBLIC_DATA(type) __declspec(dllimport) type - -/* UNIX build */ -#else -# define XBT_PUBLIC(type) extern type -# define XBT_EXPORT_NO_IMPORT(type) type -# define XBT_IMPORT_NO_EXPORT(type) type -# define XBT_PUBLIC_DATA(type) extern type -#endif - -#if !defined (max) && !defined(__cplusplus) -# define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif -#if !defined (min) && !defined(__cplusplus) -# define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#define TRUE 1 -#define FALSE 0 - -#define XBT_MAX_CHANNEL 10 /* FIXME: killme */ -/*! C++ users need love */ -#ifndef SG_BEGIN_DECL -# ifdef __cplusplus -# define SG_BEGIN_DECL() extern "C" { -# else -# define SG_BEGIN_DECL() -# endif -#endif - -#ifndef SG_END_DECL -# ifdef __cplusplus -# define SG_END_DECL() } -# else -# define SG_END_DECL() -# endif -#endif -/* End of cruft for C++ */ - -SG_BEGIN_DECL() - -XBT_PUBLIC(const char *) xbt_procname(void); - -#define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */ - -SG_END_DECL() -#endif /* XBT_MISC_H */ +/* xbt.h - Public interface to the xbt (gras's toolbox) */ + +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#ifndef XBT_MISC_H +#define XBT_MISC_H + +/* Attributes are only in recent versions of GCC */ +#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)) +# define _XBT_GNUC_PRINTF( format_idx, arg_idx ) \ + __attribute__((__format__ (__printf__, format_idx, arg_idx))) +# define _XBT_GNUC_SCANF( format_idx, arg_idx ) \ + __attribute__((__format__ (__scanf__, format_idx, arg_idx))) +# define _XBT_GNUC_FORMAT( arg_idx ) \ + __attribute__((__format_arg__ (arg_idx))) +# define _XBT_GNUC_NORETURN __attribute__((__noreturn__)) +# define _XBT_GNUC_UNUSED __attribute__((unused)) +# define _XBT_GNUC_CONSTRUCTOR __attribute__((__constructor__)) +# define _XBT_GNUC_DESTRUCTOR __attribute__((__destructor__)) +# undef _XBT_NEED_INIT_PRAGMA + +#else /* !__GNUC__ */ +# define _XBT_GNUC_PRINTF( format_idx, arg_idx ) +# define _XBT_GNUC_SCANF( format_idx, arg_idx ) +# define _XBT_GNUC_FORMAT( arg_idx ) +# define _XBT_GNUC_NORETURN +# define _XBT_GNUC_UNUSED +# define _XBT_GNUC_CONSTRUCTOR +# define _XBT_GNUC_DESTRUCTOR +# define _XBT_NEED_INIT_PRAGMA 1 + +#endif /* !__GNUC__ */ + +/* inline and __FUNCTION__ are only in GCC when -ansi is off */ + +#if defined(__GNUC__) && ! defined(__STRICT_ANSI__) +# define _XBT_FUNCTION __FUNCTION__ +#elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) +# define _XBT_FUNC__ __func__ /* ISO-C99 compliant */ +#else +# define _XBT_FUNCTION "function" +#endif + +#ifndef __cplusplus +# if defined(__GNUC__) && ! defined(__STRICT_ANSI__) +# define XBT_INLINE inline +# elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) +# define XBT_INLINE inline +# elif defined(__BORLANDC__) && !defined(__STRICT_ANSI__) +# define XBT_INLINE __inline +# else +# define XBT_INLINE +# endif +# else +# define XBT_INLINE inline +#endif + +/* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */ +#ifdef MIN +# undef MIN +#endif +#define MIN(a,b) ((a)<(b)?(a):(b)) + +#ifdef MAX +# undef MAX +#endif +#define MAX(a,b) ((a)>(b)?(a):(b)) + + +/* + * Function calling convention (not used for now) + */ + +#ifdef _WIN32 +# ifndef _XBT_CALL +# define _XBT_CALL __cdecl +# endif +#else +# define _XBT_CALL +#endif + +/* Handle import/export stuff + * + * Rational of XBT_PUBLIC: + * * This is for library symbols visible from the application-land. + * Basically, any symbols defined in the include/directory must be + * like this (plus some other globals). + * + * UNIX coders should just think of it as a special way to say "extern". + * + * * If you build the DLL, define the DLL_EXPORT symbol so that all symbols + * actually get exported by this file. + + * * If you do a static windows compilation, define DLL_STATIC, both when + * compiling the application files and when compiling the library. + * + * * If you link your application against the DLL or if you do a UNIX build, + * don't do anything special. This file will do the right thing for you + * by default. + * + * + * Rational of XBT_EXPORT_NO_IMPORT: (windows-only cruft) + * * Symbols which must be exported in the DLL, but not imported from it. + * + * * This is obviously useful for initialized globals (which cannot be + * extern or similar). + * * This is also used in the log mecanism where a macro creates the + * variable automatically. When the macro is called from within SimGrid, + * the symbol must be exported, but when called from within the client + * code, it must not try to retrieve the symbol from the DLL since it's + * not in there. + * + * Rational of XBT_IMPORT_NO_EXPORT: (windows-only cruft) + * * Symbols which must be imported from the DLL, but not explicitely + * exported from it. + * + * * The root log category is already exported, but not imported explicitely + * when creating a subcategory since we cannot import the parent category + * to deal with the fact that the parent may be in application space, not + * DLL space. + */ + + +/* Build the DLL */ +#if defined(DLL_EXPORT) +# define XBT_PUBLIC(type) __declspec(dllexport) type +# define XBT_EXPORT_NO_IMPORT(type) __declspec(dllexport) type +# define XBT_IMPORT_NO_EXPORT(type) type +# define XBT_PUBLIC_DATA(type) __declspec(dllexport) type + +/* Pack everything up statically */ +#elif defined(DLL_STATIC) +# define XBT_PUBLIC(type) extern type +# define XBT_EXPORT_NO_IMPORT(type) type +# define XBT_IMPORT_NO_EXPORT(type) type +# define XBT_PUBLIC_DATA(type) extern type + + +/* Link against the DLL */ +#elif (defined(_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC)) +# define XBT_PUBLIC(type) __declspec(dllimport) type +# define XBT_EXPORT_NO_IMPORT(type) type +# define XBT_IMPORT_NO_EXPORT(type) __declspec(dllimport) type +# define XBT_PUBLIC_DATA(type) __declspec(dllimport) type + +/* UNIX build */ +#else +# define XBT_PUBLIC(type) extern type +# define XBT_EXPORT_NO_IMPORT(type) type +# define XBT_IMPORT_NO_EXPORT(type) type +# define XBT_PUBLIC_DATA(type) extern type +#endif + +#if !defined (max) && !defined(__cplusplus) +# define max(a,b) (((a) > (b)) ? (a) : (b)) +#endif +#if !defined (min) && !defined(__cplusplus) +# define min(a,b) (((a) < (b)) ? (a) : (b)) +#endif + +#define TRUE 1 +#define FALSE 0 + +#define XBT_MAX_CHANNEL 10 /* FIXME: killme */ +/*! C++ users need love */ +#ifndef SG_BEGIN_DECL +# ifdef __cplusplus +# define SG_BEGIN_DECL() extern "C" { +# else +# define SG_BEGIN_DECL() +# endif +#endif + +#ifndef SG_END_DECL +# ifdef __cplusplus +# define SG_END_DECL() } +# else +# define SG_END_DECL() +# endif +#endif +/* End of cruft for C++ */ + +SG_BEGIN_DECL() + +XBT_PUBLIC(const char *) xbt_procname(void); + +#define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */ + +SG_END_DECL() +#endif /* XBT_MISC_H */ diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c index a947f07ffb..2f1158ebaf 100644 --- a/src/gras/DataDesc/ddt_create.c +++ b/src/gras/DataDesc/ddt_create.c @@ -1,1123 +1,1123 @@ -/* ddt_new - creation/deletion of datatypes structs (private to this module)*/ - -/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#include "xbt/misc.h" /* min()/max() */ -#include "xbt/ex.h" -#include "gras/DataDesc/datadesc_private.h" - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt_create, gras_ddt, - "Creating new datadescriptions"); - -/*** prototypes ***/ -static gras_dd_cat_field_t -gras_dd_find_field(gras_datadesc_type_t type, const char *field_name); -/** - * gras_ddt_freev: - * - * gime that memory back, dude. I mean it. - */ -void gras_ddt_freev(void *ddt) -{ - gras_datadesc_type_t type = (gras_datadesc_type_t) ddt; - - if (type) { - gras_datadesc_free(&type); - } -} - -static gras_datadesc_type_t gras_ddt_new(const char *name) -{ - gras_datadesc_type_t res; - - XBT_IN1("(%s)", name); - res = xbt_new0(s_gras_datadesc_type_t, 1); - - res->name = (char *) strdup(name); - res->name_len = strlen(name); - res->cycle = 0; - - xbt_set_add(gras_datadesc_set_local, (xbt_set_elm_t) res, gras_ddt_freev); - XBT_OUT; - return res; -} - -/** @brief retrieve an existing message type from its name (or NULL if it does not exist). */ -gras_datadesc_type_t gras_datadesc_by_name_or_null(const char *name) -{ - xbt_ex_t e; - gras_datadesc_type_t res = NULL; - - TRY { - res = gras_datadesc_by_name(name); - } CATCH(e) { - res = NULL; - xbt_ex_free(e); - } - return res; -} - -/** - * Search the given datadesc (or raises an exception if it can't be found) - */ -gras_datadesc_type_t gras_datadesc_by_name(const char *name) -{ - xbt_ex_t e; - gras_datadesc_type_t res = NULL; - volatile int found = 0; - TRY { - res = - (gras_datadesc_type_t) xbt_set_get_by_name(gras_datadesc_set_local, - name); - found = 1; - } CATCH(e) { - if (e.category != not_found_error) - RETHROW; - xbt_ex_free(e); - } - if (!found) - THROW1(not_found_error, 0, "No registred datatype of that name: %s", - name); - - return res; -} - -/** - * Retrieve a type from its code (or NULL if not found) - */ -gras_datadesc_type_t gras_datadesc_by_id(long int code) -{ - xbt_ex_t e; - gras_datadesc_type_t res = NULL; - TRY { - res = - (gras_datadesc_type_t) xbt_set_get_by_id(gras_datadesc_set_local, code); - } CATCH(e) { - if (e.category != not_found_error) - RETHROW; - xbt_ex_free(e); - res = NULL; - } - return res; -} - -/** - * Create a new scalar and give a pointer to it - */ -gras_datadesc_type_t -gras_datadesc_scalar(const char *name, - gras_ddt_scalar_type_t type, - enum e_gras_dd_scalar_encoding encoding) -{ - - gras_datadesc_type_t res; - long int arch; - - XBT_IN; - res = gras_datadesc_by_name_or_null(name); - if (res) { - xbt_assert1(res->category_code == e_gras_datadesc_type_cat_scalar, - "Redefinition of type %s does not match", name); - xbt_assert1(res->category.scalar_data.encoding == encoding, - "Redefinition of type %s does not match", name); - xbt_assert1(res->category.scalar_data.type == type, - "Redefinition of type %s does not match", name); - VERB1("Discarding redefinition of %s", name); - return res; - } - res = gras_ddt_new(name); - - for (arch = 0; arch < gras_arch_count; arch++) { - res->size[arch] = gras_arches[arch].sizeofs[type]; - res->alignment[arch] = gras_arches[arch].boundaries[type]; - res->aligned_size[arch] = - ddt_aligned(res->size[arch], res->alignment[arch]); - } - - res->category_code = e_gras_datadesc_type_cat_scalar; - res->category.scalar_data.encoding = encoding; - res->category.scalar_data.type = type; - XBT_OUT; - - return res; -} - - -/** Frees one struct or union field */ -void gras_dd_cat_field_free(void *f) -{ - gras_dd_cat_field_t field = *(gras_dd_cat_field_t *) f; - XBT_IN; - if (field) { - if (field->name) - free(field->name); - free(field); - } - XBT_OUT; -} - -/** \brief Declare a new structure description */ -gras_datadesc_type_t gras_datadesc_struct(const char *name) -{ - - gras_datadesc_type_t res; - long int arch; - - XBT_IN1("(%s)", name); - res = gras_datadesc_by_name_or_null(name); - if (res) { - /* FIXME: Check that field redefinition matches */ - xbt_assert1(res->category_code == e_gras_datadesc_type_cat_struct, - "Redefinition of type %s does not match", name); - VERB1("Discarding redefinition of %s", name); - return res; - } - res = gras_ddt_new(name); - - for (arch = 0; arch < gras_arch_count; arch++) { - res->size[arch] = 0; - res->alignment[arch] = 0; - res->aligned_size[arch] = 0; - } - res->category_code = e_gras_datadesc_type_cat_struct; - res->category.struct_data.fields = - xbt_dynar_new(sizeof(gras_dd_cat_field_t), gras_dd_cat_field_free); - - XBT_OUT; - return res; -} - -/** \brief Append a new field to a structure description */ -void -gras_datadesc_struct_append(gras_datadesc_type_t struct_type, - const char *name, gras_datadesc_type_t field_type) -{ - - gras_dd_cat_field_t field; - int arch; - - xbt_assert2(field_type, - "Cannot add the field '%s' into struct '%s': its type is NULL", - name, struct_type->name); - XBT_IN3("(%s %s.%s;)", field_type->name, struct_type->name, name); - if (struct_type->category.struct_data.closed) { - VERB1 - ("Ignoring request to add field to struct %s (closed. Redefinition?)", - struct_type->name); - return; - } - - xbt_assert1(field_type->size[GRAS_THISARCH] >= 0, - "Cannot add a dynamically sized field in structure %s", - struct_type->name); - - field = xbt_new(s_gras_dd_cat_field_t, 1); - field->name = (char *) strdup(name); - - DEBUG0("----------------"); - DEBUG3("PRE s={size=%ld,align=%ld,asize=%ld}", - struct_type->size[GRAS_THISARCH], - struct_type->alignment[GRAS_THISARCH], - struct_type->aligned_size[GRAS_THISARCH]); - - - for (arch = 0; arch < gras_arch_count; arch++) { - field->offset[arch] = ddt_aligned(struct_type->size[arch], - field_type->alignment[arch]); - - struct_type->size[arch] = field->offset[arch] + field_type->size[arch]; - struct_type->alignment[arch] = max(struct_type->alignment[arch], - field_type->alignment[arch]); - struct_type->aligned_size[arch] = ddt_aligned(struct_type->size[arch], - struct_type->alignment - [arch]); - } - field->type = field_type; - field->send = NULL; - field->recv = NULL; - - xbt_dynar_push(struct_type->category.struct_data.fields, &field); - - DEBUG3("Push a %s into %s at offset %ld.", - field_type->name, struct_type->name, field->offset[GRAS_THISARCH]); - DEBUG3(" f={size=%ld,align=%ld,asize=%ld}", - field_type->size[GRAS_THISARCH], - field_type->alignment[GRAS_THISARCH], - field_type->aligned_size[GRAS_THISARCH]); - DEBUG3(" s={size=%ld,align=%ld,asize=%ld}", - struct_type->size[GRAS_THISARCH], - struct_type->alignment[GRAS_THISARCH], - struct_type->aligned_size[GRAS_THISARCH]); - XBT_OUT; -} - -/** \brief Close a structure description - * - * No new field can be added afterward, and it is mandatory to close the structure before using it. - */ -void gras_datadesc_struct_close(gras_datadesc_type_t struct_type) -{ - int arch; - XBT_IN; - struct_type->category.struct_data.closed = 1; - for (arch = 0; arch < gras_arch_count; arch++) { - struct_type->size[arch] = struct_type->aligned_size[arch]; - } - DEBUG4("structure %s closed. size=%ld,align=%ld,asize=%ld", - struct_type->name, - struct_type->size[GRAS_THISARCH], - struct_type->alignment[GRAS_THISARCH], - struct_type->aligned_size[GRAS_THISARCH]); -} - -/** - * gras_datadesc_cycle_set: - * - * Tell GRAS that the pointers of the type described by ddt may present - * some loop, and that the cycle detection mechanism is needed. - * - * Note that setting this option when not needed have a rather bad effect - * on the performance (several times slower on big data). - */ -void gras_datadesc_cycle_set(gras_datadesc_type_t ddt) -{ - ddt->cycle = 1; -} - -/** - * gras_datadesc_cycle_unset: - * - * Tell GRAS that the pointers of the type described by ddt do not present - * any loop and that cycle detection mechanism are not needed. - * (default) - */ -void gras_datadesc_cycle_unset(gras_datadesc_type_t ddt) -{ - ddt->cycle = 0; -} - -/** \brief Declare a new union description */ -gras_datadesc_type_t -gras_datadesc_union(const char *name, gras_datadesc_type_cb_int_t selector) -{ - - gras_datadesc_type_t res; - int arch; - - XBT_IN1("(%s)", name); - xbt_assert0(selector, - "Attempt to creat an union without field_count function"); - - res = gras_datadesc_by_name_or_null(name); - if (res) { - /* FIXME: Check that field redefinition matches */ - xbt_assert1(res->category_code == e_gras_datadesc_type_cat_union, - "Redefinition of type %s does not match", name); - xbt_assert1(res->category.union_data.selector == selector, - "Redefinition of type %s does not match", name); - VERB1("Discarding redefinition of %s", name); - return res; - } - - res = gras_ddt_new(name); - - for (arch = 0; arch < gras_arch_count; arch++) { - res->size[arch] = 0; - res->alignment[arch] = 0; - res->aligned_size[arch] = 0; - } - - res->category_code = e_gras_datadesc_type_cat_union; - res->category.union_data.fields = - xbt_dynar_new(sizeof(gras_dd_cat_field_t *), gras_dd_cat_field_free); - res->category.union_data.selector = selector; - - return res; -} - -/** \brief Append a new field to an union description */ -void gras_datadesc_union_append(gras_datadesc_type_t union_type, - const char *name, - gras_datadesc_type_t field_type) -{ - - gras_dd_cat_field_t field; - int arch; - - XBT_IN3("(%s %s.%s;)", field_type->name, union_type->name, name); - xbt_assert1(field_type->size[GRAS_THISARCH] >= 0, - "Cannot add a dynamically sized field in union %s", - union_type->name); - - if (union_type->category.union_data.closed) { - VERB1("Ignoring request to add field to union %s (closed)", - union_type->name); - return; - } - - field = xbt_new0(s_gras_dd_cat_field_t, 1); - - field->name = (char *) strdup(name); - field->type = field_type; - /* All offset are left to 0 in an union */ - - xbt_dynar_push(union_type->category.union_data.fields, &field); - - for (arch = 0; arch < gras_arch_count; arch++) { - union_type->size[arch] = max(union_type->size[arch], - field_type->size[arch]); - union_type->alignment[arch] = max(union_type->alignment[arch], - field_type->alignment[arch]); - union_type->aligned_size[arch] = ddt_aligned(union_type->size[arch], - union_type->alignment[arch]); - } -} - - -/** \brief Close an union description - * - * No new field can be added afterward, and it is mandatory to close the union before using it. - */ -void gras_datadesc_union_close(gras_datadesc_type_t union_type) -{ - union_type->category.union_data.closed = 1; -} - -/** \brief Copy a type under another name - * - * This may reveal useful to circumvent parsing macro limitations - */ -gras_datadesc_type_t -gras_datadesc_copy(const char *name, gras_datadesc_type_t copied) -{ - - gras_datadesc_type_t res = gras_ddt_new(name); - char *name_cpy = res->name; - - memcpy(res, copied, sizeof(s_gras_datadesc_type_t)); - res->name = name_cpy; - return res; -} - -/** \brief Declare a new type being a reference to the one passed in arg */ -gras_datadesc_type_t -gras_datadesc_ref(const char *name, gras_datadesc_type_t referenced_type) -{ - - gras_datadesc_type_t res; - gras_datadesc_type_t pointer_type = gras_datadesc_by_name("data pointer"); - int arch; - - XBT_IN1("(%s)", name); - res = gras_datadesc_by_name_or_null(name); - if (res) { - xbt_assert1(res->category_code == e_gras_datadesc_type_cat_ref, - "Redefinition of %s does not match", name); - xbt_assert1(res->category.ref_data.type == referenced_type, - "Redefinition of %s does not match", name); - xbt_assert1(res->category.ref_data.selector == NULL, - "Redefinition of %s does not match", name); - VERB1("Discarding redefinition of %s", name); - return res; - } - - res = gras_ddt_new(name); - - xbt_assert0(pointer_type, "Cannot get the description of data pointer"); - - for (arch = 0; arch < gras_arch_count; arch++) { - res->size[arch] = pointer_type->size[arch]; - res->alignment[arch] = pointer_type->alignment[arch]; - res->aligned_size[arch] = pointer_type->aligned_size[arch]; - } - - res->category_code = e_gras_datadesc_type_cat_ref; - res->category.ref_data.type = referenced_type; - res->category.ref_data.selector = NULL; - - return res; -} - -/** \brief Declare a new type being a generic reference. - * - * The callback passed in argument is to be used to select which type is currently used. - * So, when GRAS wants to send a generic reference, it passes the current data to the selector - * callback and expects it to return the type description to use. - */ -gras_datadesc_type_t -gras_datadesc_ref_generic(const char *name, gras_datadesc_selector_t selector) -{ - - gras_datadesc_type_t res; - gras_datadesc_type_t pointer_type = gras_datadesc_by_name("data pointer"); - int arch; - - XBT_IN1("(%s)", name); - res = gras_datadesc_by_name_or_null(name); - - if (res) { - xbt_assert1(res->category_code == e_gras_datadesc_type_cat_ref, - "Redefinition of type %s does not match", name); - xbt_assert1(res->category.ref_data.type == NULL, - "Redefinition of type %s does not match", name); - xbt_assert1(res->category.ref_data.selector == selector, - "Redefinition of type %s does not match", name); - VERB1("Discarding redefinition of %s", name); - return res; - } - res = gras_ddt_new(name); - - xbt_assert0(pointer_type, "Cannot get the description of data pointer"); - - for (arch = 0; arch < gras_arch_count; arch++) { - res->size[arch] = pointer_type->size[arch]; - res->alignment[arch] = pointer_type->alignment[arch]; - res->aligned_size[arch] = pointer_type->aligned_size[arch]; - } - - res->category_code = e_gras_datadesc_type_cat_ref; - - res->category.ref_data.type = NULL; - res->category.ref_data.selector = selector; - - return res; -} - -/** \brief Declare a new type being an array of fixed size and content */ -gras_datadesc_type_t -gras_datadesc_array_fixed(const char *name, - gras_datadesc_type_t element_type, - long int fixed_size) -{ - - gras_datadesc_type_t res; - int arch; - - XBT_IN1("(%s)", name); - res = gras_datadesc_by_name_or_null(name); - if (res) { - xbt_assert1(res->category_code == e_gras_datadesc_type_cat_array, - "Redefinition of type %s does not match", name); - - if (res->category.array_data.type != element_type) { - ERROR1("Redefinition of type %s does not match: array elements differ", - name); - gras_datadesc_type_dump(res->category.array_data.type); - gras_datadesc_type_dump(element_type); - } - - xbt_assert1(res->category.array_data.fixed_size == fixed_size, - "Redefinition of type %s does not match", name); - xbt_assert1(res->category.array_data.dynamic_size == NULL, - "Redefinition of type %s does not match", name); - VERB1("Discarding redefinition of %s", name); - - return res; - } - res = gras_ddt_new(name); - - xbt_assert1(fixed_size >= 0, "'%s' is a array of negative fixed size", - name); - for (arch = 0; arch < gras_arch_count; arch++) { - res->size[arch] = fixed_size * element_type->aligned_size[arch]; - res->alignment[arch] = element_type->alignment[arch]; - res->aligned_size[arch] = res->size[arch]; - } - - res->category_code = e_gras_datadesc_type_cat_array; - - res->category.array_data.type = element_type; - res->category.array_data.fixed_size = fixed_size; - res->category.array_data.dynamic_size = NULL; - - return res; -} - -/** \brief Declare a new type being an array of fixed size, but accepting several content types. */ -gras_datadesc_type_t gras_datadesc_array_dyn(const char *name, - gras_datadesc_type_t - element_type, - gras_datadesc_type_cb_int_t - dynamic_size) -{ - - gras_datadesc_type_t res; - int arch; - - XBT_IN1("(%s)", name); - xbt_assert1(dynamic_size, - "'%s' is a dynamic array without size discriminant", name); - - res = gras_datadesc_by_name_or_null(name); - if (res) { - xbt_assert1(res->category_code == e_gras_datadesc_type_cat_array, - "Redefinition of type %s does not match", name); - xbt_assert1(res->category.array_data.type == element_type, - "Redefinition of type %s does not match", name); - xbt_assert1(res->category.array_data.fixed_size == -1, - "Redefinition of type %s does not match", name); - xbt_assert1(res->category.array_data.dynamic_size == dynamic_size, - "Redefinition of type %s does not match", name); - VERB1("Discarding redefinition of %s", name); - - return res; - } - - res = gras_ddt_new(name); - - for (arch = 0; arch < gras_arch_count; arch++) { - res->size[arch] = 0; /* make sure it indicates "dynamic" */ - res->alignment[arch] = element_type->alignment[arch]; - res->aligned_size[arch] = 0; /*FIXME: That was so in GS, but looks stupid */ - } - - res->category_code = e_gras_datadesc_type_cat_array; - - res->category.array_data.type = element_type; - res->category.array_data.fixed_size = -1; - res->category.array_data.dynamic_size = dynamic_size; - - return res; -} - -/** \brief Declare a new type being an array which size can be found with \ref gras_cbps_i_pop - * - * Most of the time, you want to include a reference in your structure which - * is a pointer to a dynamic array whose size is fixed by another field of - * your structure. - * - * This case pops up so often that this function was created to take care of - * this case. It creates a dynamic array type whose size is poped from the - * current cbps, and then create a reference to it. - * - * The name of the created datatype will be the name of the element type, with - * '[]*' appended to it. - * - * Then to use it, you just have to make sure that your structure pre-callback - * does push the size of the array in the cbps (using #gras_cbps_i_push), and - * you are set. - * - * But be remember that this is a stack. If you have two different pop_arr, you - * should push the second one first, so that the first one is on the top of the - * list when the first field gets transfered. - * - */ -gras_datadesc_type_t -gras_datadesc_ref_pop_arr(gras_datadesc_type_t element_type) -{ - int cpt=0; - gras_datadesc_type_t res,ddt2; - char *name = (char *) xbt_malloc(strlen(element_type->name) + 4); - - sprintf(name, "%s[]", element_type->name); - /* Make sure we are not trying to redefine a ddt with the same name */ - ddt2 = gras_datadesc_by_name_or_null(name); - - while (ddt2) { - free(name); - name=bprintf("%s[]_%d",element_type->name,cpt++); - ddt2=gras_datadesc_by_name_or_null(name); - } - - res = gras_datadesc_array_dyn(name, element_type, gras_datadesc_cb_pop); - - sprintf(name, "%s[]*", element_type->name); - cpt=0; - ddt2 = gras_datadesc_by_name_or_null(name); - while (ddt2) { - free(name); - name=bprintf("%s[]*_%d",element_type->name,cpt++); - ddt2=gras_datadesc_by_name_or_null(name); - } - - res = gras_datadesc_ref(name, res); - - free(name); - - return res; -} - -/* - *## - *## Constructor of container datatypes - *## - */ - -static void gras_datadesc_dynar_cb(gras_datadesc_type_t typedesc, - gras_cbps_t vars, void *data) -{ - gras_datadesc_type_t subtype; - xbt_dynar_t dynar = (xbt_dynar_t) data; - - memcpy(&dynar->free_f, &typedesc->extra, sizeof(dynar->free_f)); - - /* search for the elemsize in what we have. If elements are "int", typedesc got is "int[]*" */ - subtype = gras_dd_find_field(typedesc, "data")->type; - - /* this is now a ref to array of what we're looking for */ - subtype = subtype->category.ref_data.type; - subtype = subtype->category.array_data.type; - - DEBUG1("subtype is %s", subtype->name); - - dynar->elmsize = subtype->size[GRAS_THISARCH]; - dynar->size = dynar->used; - dynar->mutex = NULL; -} - -/** \brief Declare a new type being a dynar in which each elements are of the given type - * - * The type gets registered under the name "dynar(%s)_s", where %s is the name of the subtype. - * For example, a dynar of doubles will be called "dynar(double)_s" and a dynar of dynar of - * strings will be called "dynar(dynar(string)_s)_s". - * - * \param elm_t: the datadesc of the elements - * \param free_func: the function to use to free the elements when the dynar gets freed - */ -gras_datadesc_type_t -gras_datadesc_dynar(gras_datadesc_type_t elm_t, void_f_pvoid_t free_func) -{ - - char *buffname; - gras_datadesc_type_t res; - - asprintf(&buffname, "s_xbt_dynar_of_%s", elm_t->name); - - res = gras_datadesc_struct(buffname); - - gras_datadesc_struct_append(res, "size", - gras_datadesc_by_name("unsigned long int")); - - gras_datadesc_struct_append(res, "used", - gras_datadesc_by_name("unsigned long int")); - - gras_datadesc_struct_append(res, "elmsize", - gras_datadesc_by_name("unsigned long int")); - - gras_datadesc_struct_append(res, "data", gras_datadesc_ref_pop_arr(elm_t)); - - gras_datadesc_struct_append(res, "free_f", - gras_datadesc_by_name("function pointer")); - memcpy(res->extra, &free_func, sizeof(free_func)); - - gras_datadesc_struct_append(res, "mutex", - gras_datadesc_by_name("data pointer")); - - gras_datadesc_struct_close(res); - - gras_datadesc_cb_field_push(res, "used"); - gras_datadesc_cb_recv(res, &gras_datadesc_dynar_cb); - - /* build a ref to it */ - free(buffname); - asprintf(&buffname, "xbt_dynar_of_%s", elm_t->name); - res = gras_datadesc_ref(buffname, res); - free(buffname); - return res; -} - -#include "xbt/matrix.h" -static void gras_datadesc_matrix_cb(gras_datadesc_type_t typedesc, - gras_cbps_t vars, void *data) -{ - gras_datadesc_type_t subtype; - xbt_matrix_t matrix = (xbt_matrix_t) data; - - memcpy(&matrix->free_f, &typedesc->extra, sizeof(matrix->free_f)); - - /* search for the elemsize in what we have. If elements are "int", typedesc got is "int[]*" */ - subtype = gras_dd_find_field(typedesc, "data")->type; - - /* this is now a ref to array of what we're looking for */ - subtype = subtype->category.ref_data.type; - subtype = subtype->category.array_data.type; - - DEBUG1("subtype is %s", subtype->name); - - matrix->elmsize = subtype->size[GRAS_THISARCH]; -} - -gras_datadesc_type_t -gras_datadesc_matrix(gras_datadesc_type_t elm_t, void_f_pvoid_t const free_f) -{ - char *buffname; - gras_datadesc_type_t res; - - asprintf(&buffname, "s_xbt_matrix_t(%s)", elm_t->name); - res = gras_datadesc_struct(buffname); - - gras_datadesc_struct_append(res, "lines", - gras_datadesc_by_name("unsigned int")); - gras_datadesc_struct_append(res, "rows", - gras_datadesc_by_name("unsigned int")); - - gras_datadesc_struct_append(res, "elmsize", - gras_datadesc_by_name("unsigned long int")); - - gras_datadesc_struct_append(res, "data", gras_datadesc_ref_pop_arr(elm_t)); - gras_datadesc_struct_append(res, "free_f", - gras_datadesc_by_name("function pointer")); - gras_datadesc_struct_close(res); - - gras_datadesc_cb_field_push(res, "lines"); - gras_datadesc_cb_field_push_multiplier(res, "rows"); - - gras_datadesc_cb_recv(res, &gras_datadesc_matrix_cb); - memcpy(res->extra, &free_f, sizeof(free_f)); - - /* build a ref to it */ - free(buffname); - asprintf(&buffname, "xbt_matrix_t(%s)", elm_t->name); - res = gras_datadesc_ref(buffname, res); - free(buffname); - return res; -} - -gras_datadesc_type_t -gras_datadesc_import_nws(const char *name, - const DataDescriptor * desc, unsigned long howmany) -{ - THROW_UNIMPLEMENTED; -} - -/** - * (useful to push the sizes of the upcoming arrays, for example) - */ -void gras_datadesc_cb_send(gras_datadesc_type_t type, - gras_datadesc_type_cb_void_t send) -{ - type->send = send; -} - -/** - * (useful to put the function pointers to the rigth value, for example) - */ -void gras_datadesc_cb_recv(gras_datadesc_type_t type, - gras_datadesc_type_cb_void_t recv) -{ - type->recv = recv; -} - -/* - * gras_dd_find_field: - * - * Returns the type descriptor of the given field. Abort on error. - */ -static gras_dd_cat_field_t -gras_dd_find_field(gras_datadesc_type_t type, const char *field_name) -{ - xbt_dynar_t field_array; - - gras_dd_cat_field_t field = NULL; - unsigned int field_num; - - if (type->category_code == e_gras_datadesc_type_cat_union) { - field_array = type->category.union_data.fields; - } else if (type->category_code == e_gras_datadesc_type_cat_struct) { - field_array = type->category.struct_data.fields; - } else { - ERROR2("%s (%p) is not a struct nor an union. There is no field.", - type->name, (void *) type); - xbt_abort(); - } - xbt_dynar_foreach(field_array, field_num, field) { - if (!strcmp(field_name, field->name)) { - return field; - } - } - ERROR2("No field named '%s' in '%s'", field_name, type->name); - xbt_abort(); - -} - -/** - * The given datadesc must be a struct or union (abort if not). - * (useful to push the sizes of the upcoming arrays, for example) - */ -void gras_datadesc_cb_field_send(gras_datadesc_type_t type, - const char *field_name, - gras_datadesc_type_cb_void_t send) -{ - - gras_dd_cat_field_t field = gras_dd_find_field(type, field_name); - field->send = send; -} - - -/** - * The value, which must be an int, unsigned int, long int or unsigned long int - * is pushed to the stacks of sizes and can then be retrieved with - * \ref gras_datadesc_ref_pop_arr or directly with \ref gras_cbps_i_pop. - */ -void gras_datadesc_cb_field_push(gras_datadesc_type_t type, - const char *field_name) -{ - - gras_dd_cat_field_t field = gras_dd_find_field(type, field_name); - gras_datadesc_type_t sub_type = field->type; - - DEBUG3("add a PUSHy cb to '%s' field (type '%s') of '%s'", - field_name, sub_type->name, type->name); - if (!strcmp("int", sub_type->name)) { - field->send = gras_datadesc_cb_push_int; - } else if (!strcmp("unsigned int", sub_type->name)) { - field->send = gras_datadesc_cb_push_uint; - } else if (!strcmp("long int", sub_type->name)) { - field->send = gras_datadesc_cb_push_lint; - } else if (!strcmp("unsigned long int", sub_type->name)) { - field->send = gras_datadesc_cb_push_ulint; - } else { - ERROR1 - ("Field %s is not an int, unsigned int, long int neither unsigned long int", - sub_type->name); - xbt_abort(); - } -} - -/** - * Any previously pushed value is poped and the field value is multiplied to - * it. The result is then pushed back into the stack of sizes. It can then be - * retrieved with \ref gras_datadesc_ref_pop_arr or directly with \ref - * gras_cbps_i_pop. - * - * The field must be an int, unsigned int, long int or unsigned long int. - */ -void gras_datadesc_cb_field_push_multiplier(gras_datadesc_type_t type, - const char *field_name) -{ - - gras_dd_cat_field_t field = gras_dd_find_field(type, field_name); - gras_datadesc_type_t sub_type = field->type; - - DEBUG3("add a MPUSHy cb to '%s' field (type '%s') of '%s'", - field_name, sub_type->name, type->name); - if (!strcmp("int", sub_type->name)) { - field->send = gras_datadesc_cb_push_int_mult; - } else if (!strcmp("unsigned int", sub_type->name)) { - field->send = gras_datadesc_cb_push_uint_mult; - } else if (!strcmp("long int", sub_type->name)) { - field->send = gras_datadesc_cb_push_lint_mult; - } else if (!strcmp("unsigned long int", sub_type->name)) { - field->send = gras_datadesc_cb_push_ulint_mult; - } else { - ERROR1 - ("Field %s is not an int, unsigned int, long int neither unsigned long int", - sub_type->name); - xbt_abort(); - } -} - -/** - * The given datadesc must be a struct or union (abort if not). - * (useful to put the function pointers to the right value, for example) - */ -void gras_datadesc_cb_field_recv(gras_datadesc_type_t type, - const char *field_name, - gras_datadesc_type_cb_void_t recv) -{ - - gras_dd_cat_field_t field = gras_dd_find_field(type, field_name); - field->recv = recv; -} - -/* - * Free a datadesc. Should only be called at xbt_exit. - */ -void gras_datadesc_free(gras_datadesc_type_t * type) -{ - - DEBUG1("Let's free ddt %s", (*type)->name); - - switch ((*type)->category_code) { - case e_gras_datadesc_type_cat_scalar: - case e_gras_datadesc_type_cat_ref: - case e_gras_datadesc_type_cat_array: - /* nothing to free in there */ - break; - - case e_gras_datadesc_type_cat_struct: - xbt_dynar_free(&((*type)->category.struct_data.fields)); - break; - - case e_gras_datadesc_type_cat_union: - xbt_dynar_free(&((*type)->category.union_data.fields)); - break; - - default: - /* datadesc was invalid. Killing it is like euthanasy, I guess */ - break; - } - free((*type)->name); - free(*type); - type = NULL; -} - -/** - * gras_datadesc_type_cmp: - * - * Compares two datadesc types with the same semantic than strcmp. - * - * This comparison does not take the set headers into account (name and ID), - * but only the payload (actual type description). - */ -int gras_datadesc_type_cmp(const gras_datadesc_type_t d1, - const gras_datadesc_type_t d2) -{ - int ret; - unsigned int cpt; - gras_dd_cat_field_t field1, field2; - gras_datadesc_type_t field_desc_1, field_desc_2; - - if (d1 == d2) - return 0; /* easy optimization */ - - if (!d1 && d2) { - DEBUG0("ddt_cmp: !d1 && d2 => 1"); - return 1; - } - if (!d1 && !d2) { - DEBUG0("ddt_cmp: !d1 && !d2 => 0"); - return 0; - } - if (d1 && !d2) { - DEBUG0("ddt_cmp: d1 && !d2 => -1"); - return -1; - } - - for (cpt = 0; cpt < gras_arch_count; cpt++) { - if (d1->size[cpt] != d2->size[cpt]) { - DEBUG5("ddt_cmp: %s->size=%ld != %s->size=%ld (on %s)", - d1->name, d1->size[cpt], d2->name, d2->size[cpt], - gras_arches[cpt].name); - return d1->size[cpt] > d2->size[cpt] ? 1 : -1; - } - - if (d1->alignment[cpt] != d2->alignment[cpt]) { - DEBUG5("ddt_cmp: %s->alignment=%ld != %s->alignment=%ld (on %s)", - d1->name, d1->alignment[cpt], d2->name, d2->alignment[cpt], - gras_arches[cpt].name); - return d1->alignment[cpt] > d2->alignment[cpt] ? 1 : -1; - } - - if (d1->aligned_size[cpt] != d2->aligned_size[cpt]) { - DEBUG5 - ("ddt_cmp: %s->aligned_size=%ld != %s->aligned_size=%ld (on %s)", - d1->name, d1->aligned_size[cpt], d2->name, d2->aligned_size[cpt], - gras_arches[cpt].name); - return d1->aligned_size[cpt] > d2->aligned_size[cpt] ? 1 : -1; - } - } - - if (d1->category_code != d2->category_code) { - DEBUG4("ddt_cmp: %s->cat=%s != %s->cat=%s", - d1->name, gras_datadesc_cat_names[d1->category_code], - d2->name, gras_datadesc_cat_names[d2->category_code]); - return d1->category_code > d2->category_code ? 1 : -1; - } - - if (d1->send != d2->send) { - DEBUG4("ddt_cmp: %s->send=%p != %s->send=%p", - d1->name, (void *) d1->send, d2->name, (void *) d2->send); - return 1; /* ISO C forbids ordered comparisons of pointers to functions */ - } - - if (d1->recv != d2->recv) { - DEBUG4("ddt_cmp: %s->recv=%p != %s->recv=%p", - d1->name, (void *) d1->recv, d2->name, (void *) d2->recv); - return 1; /* ISO C forbids ordered comparisons of pointers to functions */ - } - - switch (d1->category_code) { - case e_gras_datadesc_type_cat_scalar: - if (d1->category.scalar_data.encoding != - d2->category.scalar_data.encoding) - return d1->category.scalar_data.encoding > - d2->category.scalar_data.encoding ? 1 : -1; - break; - - case e_gras_datadesc_type_cat_struct: - if (xbt_dynar_length(d1->category.struct_data.fields) != - xbt_dynar_length(d2->category.struct_data.fields)) { - DEBUG4("ddt_cmp: %s (having %lu fields) != %s (having %lu fields)", - d1->name, xbt_dynar_length(d1->category.struct_data.fields), - d2->name, xbt_dynar_length(d2->category.struct_data.fields)); - - return xbt_dynar_length(d1->category.struct_data.fields) > - xbt_dynar_length(d2->category.struct_data.fields) ? 1 : -1; - } - xbt_dynar_foreach(d1->category.struct_data.fields, cpt, field1) { - - field2 = - xbt_dynar_get_as(d2->category.struct_data.fields, cpt, - gras_dd_cat_field_t); - field_desc_1 = field1->type; - field_desc_2 = field2->type; - ret = gras_datadesc_type_cmp(field_desc_1, field_desc_2); - if (ret) { - DEBUG6("%s->field[%d]=%s != %s->field[%d]=%s", - d1->name, cpt, field1->name, d2->name, cpt, field2->name); - return ret; - } - - } - break; - - case e_gras_datadesc_type_cat_union: - if (d1->category.union_data.selector != d2->category.union_data.selector) - return 1; /* ISO C forbids ordered comparisons of pointers to functions */ - - if (xbt_dynar_length(d1->category.union_data.fields) != - xbt_dynar_length(d2->category.union_data.fields)) - return xbt_dynar_length(d1->category.union_data.fields) > - xbt_dynar_length(d2->category.union_data.fields) ? 1 : -1; - - xbt_dynar_foreach(d1->category.union_data.fields, cpt, field1) { - - field2 = - xbt_dynar_get_as(d2->category.union_data.fields, cpt, - gras_dd_cat_field_t); - field_desc_1 = field1->type; - field_desc_2 = field2->type; - ret = gras_datadesc_type_cmp(field_desc_1, field_desc_2); - if (ret) - return ret; - - } - break; - - - case e_gras_datadesc_type_cat_ref: - if (d1->category.ref_data.selector != d2->category.ref_data.selector) - return 1; /* ISO C forbids ordered comparisons of pointers to functions */ - - if (d1->category.ref_data.type != d2->category.ref_data.type) - return d1->category.ref_data.type > d2->category.ref_data.type ? 1 : -1; - break; - - case e_gras_datadesc_type_cat_array: - if (d1->category.array_data.type != d2->category.array_data.type) - return d1->category.array_data.type > - d2->category.array_data.type ? 1 : -1; - - if (d1->category.array_data.fixed_size != - d2->category.array_data.fixed_size) - return d1->category.array_data.fixed_size > - d2->category.array_data.fixed_size ? 1 : -1; - - if (d1->category.array_data.dynamic_size != - d2->category.array_data.dynamic_size) - return 1; /* ISO C forbids ordered comparisons of pointers to functions */ - - break; - - default: - /* two stupidly created ddt are equally stupid ;) */ - break; - } - return 0; - -} +/* ddt_new - creation/deletion of datatypes structs (private to this module)*/ + +/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "xbt/misc.h" /* min()/max() */ +#include "xbt/ex.h" +#include "gras/DataDesc/datadesc_private.h" + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt_create, gras_ddt, + "Creating new datadescriptions"); + +/*** prototypes ***/ +static gras_dd_cat_field_t +gras_dd_find_field(gras_datadesc_type_t type, const char *field_name); +/** + * gras_ddt_freev: + * + * gime that memory back, dude. I mean it. + */ +void gras_ddt_freev(void *ddt) +{ + gras_datadesc_type_t type = (gras_datadesc_type_t) ddt; + + if (type) { + gras_datadesc_free(&type); + } +} + +static gras_datadesc_type_t gras_ddt_new(const char *name) +{ + gras_datadesc_type_t res; + + XBT_IN1("(%s)", name); + res = xbt_new0(s_gras_datadesc_type_t, 1); + + res->name = (char *) strdup(name); + res->name_len = strlen(name); + res->cycle = 0; + + xbt_set_add(gras_datadesc_set_local, (xbt_set_elm_t) res, gras_ddt_freev); + XBT_OUT; + return res; +} + +/** @brief retrieve an existing message type from its name (or NULL if it does not exist). */ +gras_datadesc_type_t gras_datadesc_by_name_or_null(const char *name) +{ + xbt_ex_t e; + gras_datadesc_type_t res = NULL; + + TRY { + res = gras_datadesc_by_name(name); + } CATCH(e) { + res = NULL; + xbt_ex_free(e); + } + return res; +} + +/** + * Search the given datadesc (or raises an exception if it can't be found) + */ +gras_datadesc_type_t gras_datadesc_by_name(const char *name) +{ + xbt_ex_t e; + gras_datadesc_type_t res = NULL; + volatile int found = 0; + TRY { + res = + (gras_datadesc_type_t) xbt_set_get_by_name(gras_datadesc_set_local, + name); + found = 1; + } CATCH(e) { + if (e.category != not_found_error) + RETHROW; + xbt_ex_free(e); + } + if (!found) + THROW1(not_found_error, 0, "No registred datatype of that name: %s", + name); + + return res; +} + +/** + * Retrieve a type from its code (or NULL if not found) + */ +gras_datadesc_type_t gras_datadesc_by_id(long int code) +{ + xbt_ex_t e; + gras_datadesc_type_t res = NULL; + TRY { + res = + (gras_datadesc_type_t) xbt_set_get_by_id(gras_datadesc_set_local, code); + } CATCH(e) { + if (e.category != not_found_error) + RETHROW; + xbt_ex_free(e); + res = NULL; + } + return res; +} + +/** + * Create a new scalar and give a pointer to it + */ +gras_datadesc_type_t +gras_datadesc_scalar(const char *name, + gras_ddt_scalar_type_t type, + enum e_gras_dd_scalar_encoding encoding) +{ + + gras_datadesc_type_t res; + long int arch; + + XBT_IN; + res = gras_datadesc_by_name_or_null(name); + if (res) { + xbt_assert1(res->category_code == e_gras_datadesc_type_cat_scalar, + "Redefinition of type %s does not match", name); + xbt_assert1(res->category.scalar_data.encoding == encoding, + "Redefinition of type %s does not match", name); + xbt_assert1(res->category.scalar_data.type == type, + "Redefinition of type %s does not match", name); + VERB1("Discarding redefinition of %s", name); + return res; + } + res = gras_ddt_new(name); + + for (arch = 0; arch < gras_arch_count; arch++) { + res->size[arch] = gras_arches[arch].sizeofs[type]; + res->alignment[arch] = gras_arches[arch].boundaries[type]; + res->aligned_size[arch] = + ddt_aligned(res->size[arch], res->alignment[arch]); + } + + res->category_code = e_gras_datadesc_type_cat_scalar; + res->category.scalar_data.encoding = encoding; + res->category.scalar_data.type = type; + XBT_OUT; + + return res; +} + + +/** Frees one struct or union field */ +void gras_dd_cat_field_free(void *f) +{ + gras_dd_cat_field_t field = *(gras_dd_cat_field_t *) f; + XBT_IN; + if (field) { + if (field->name) + free(field->name); + free(field); + } + XBT_OUT; +} + +/** \brief Declare a new structure description */ +gras_datadesc_type_t gras_datadesc_struct(const char *name) +{ + + gras_datadesc_type_t res; + long int arch; + + XBT_IN1("(%s)", name); + res = gras_datadesc_by_name_or_null(name); + if (res) { + /* FIXME: Check that field redefinition matches */ + xbt_assert1(res->category_code == e_gras_datadesc_type_cat_struct, + "Redefinition of type %s does not match", name); + VERB1("Discarding redefinition of %s", name); + return res; + } + res = gras_ddt_new(name); + + for (arch = 0; arch < gras_arch_count; arch++) { + res->size[arch] = 0; + res->alignment[arch] = 0; + res->aligned_size[arch] = 0; + } + res->category_code = e_gras_datadesc_type_cat_struct; + res->category.struct_data.fields = + xbt_dynar_new(sizeof(gras_dd_cat_field_t), gras_dd_cat_field_free); + + XBT_OUT; + return res; +} + +/** \brief Append a new field to a structure description */ +void +gras_datadesc_struct_append(gras_datadesc_type_t struct_type, + const char *name, gras_datadesc_type_t field_type) +{ + + gras_dd_cat_field_t field; + int arch; + + xbt_assert2(field_type, + "Cannot add the field '%s' into struct '%s': its type is NULL", + name, struct_type->name); + XBT_IN3("(%s %s.%s;)", field_type->name, struct_type->name, name); + if (struct_type->category.struct_data.closed) { + VERB1 + ("Ignoring request to add field to struct %s (closed. Redefinition?)", + struct_type->name); + return; + } + + xbt_assert1(field_type->size[GRAS_THISARCH] >= 0, + "Cannot add a dynamically sized field in structure %s", + struct_type->name); + + field = xbt_new(s_gras_dd_cat_field_t, 1); + field->name = (char *) strdup(name); + + DEBUG0("----------------"); + DEBUG3("PRE s={size=%ld,align=%ld,asize=%ld}", + struct_type->size[GRAS_THISARCH], + struct_type->alignment[GRAS_THISARCH], + struct_type->aligned_size[GRAS_THISARCH]); + + + for (arch = 0; arch < gras_arch_count; arch++) { + field->offset[arch] = ddt_aligned(struct_type->size[arch], + field_type->alignment[arch]); + + struct_type->size[arch] = field->offset[arch] + field_type->size[arch]; + struct_type->alignment[arch] = max(struct_type->alignment[arch], + field_type->alignment[arch]); + struct_type->aligned_size[arch] = ddt_aligned(struct_type->size[arch], + struct_type->alignment + [arch]); + } + field->type = field_type; + field->send = NULL; + field->recv = NULL; + + xbt_dynar_push(struct_type->category.struct_data.fields, &field); + + DEBUG3("Push a %s into %s at offset %ld.", + field_type->name, struct_type->name, field->offset[GRAS_THISARCH]); + DEBUG3(" f={size=%ld,align=%ld,asize=%ld}", + field_type->size[GRAS_THISARCH], + field_type->alignment[GRAS_THISARCH], + field_type->aligned_size[GRAS_THISARCH]); + DEBUG3(" s={size=%ld,align=%ld,asize=%ld}", + struct_type->size[GRAS_THISARCH], + struct_type->alignment[GRAS_THISARCH], + struct_type->aligned_size[GRAS_THISARCH]); + XBT_OUT; +} + +/** \brief Close a structure description + * + * No new field can be added afterward, and it is mandatory to close the structure before using it. + */ +void gras_datadesc_struct_close(gras_datadesc_type_t struct_type) +{ + int arch; + XBT_IN; + struct_type->category.struct_data.closed = 1; + for (arch = 0; arch < gras_arch_count; arch++) { + struct_type->size[arch] = struct_type->aligned_size[arch]; + } + DEBUG4("structure %s closed. size=%ld,align=%ld,asize=%ld", + struct_type->name, + struct_type->size[GRAS_THISARCH], + struct_type->alignment[GRAS_THISARCH], + struct_type->aligned_size[GRAS_THISARCH]); +} + +/** + * gras_datadesc_cycle_set: + * + * Tell GRAS that the pointers of the type described by ddt may present + * some loop, and that the cycle detection mechanism is needed. + * + * Note that setting this option when not needed have a rather bad effect + * on the performance (several times slower on big data). + */ +void gras_datadesc_cycle_set(gras_datadesc_type_t ddt) +{ + ddt->cycle = 1; +} + +/** + * gras_datadesc_cycle_unset: + * + * Tell GRAS that the pointers of the type described by ddt do not present + * any loop and that cycle detection mechanism are not needed. + * (default) + */ +void gras_datadesc_cycle_unset(gras_datadesc_type_t ddt) +{ + ddt->cycle = 0; +} + +/** \brief Declare a new union description */ +gras_datadesc_type_t +gras_datadesc_union(const char *name, gras_datadesc_type_cb_int_t selector) +{ + + gras_datadesc_type_t res; + int arch; + + XBT_IN1("(%s)", name); + xbt_assert0(selector, + "Attempt to creat an union without field_count function"); + + res = gras_datadesc_by_name_or_null(name); + if (res) { + /* FIXME: Check that field redefinition matches */ + xbt_assert1(res->category_code == e_gras_datadesc_type_cat_union, + "Redefinition of type %s does not match", name); + xbt_assert1(res->category.union_data.selector == selector, + "Redefinition of type %s does not match", name); + VERB1("Discarding redefinition of %s", name); + return res; + } + + res = gras_ddt_new(name); + + for (arch = 0; arch < gras_arch_count; arch++) { + res->size[arch] = 0; + res->alignment[arch] = 0; + res->aligned_size[arch] = 0; + } + + res->category_code = e_gras_datadesc_type_cat_union; + res->category.union_data.fields = + xbt_dynar_new(sizeof(gras_dd_cat_field_t *), gras_dd_cat_field_free); + res->category.union_data.selector = selector; + + return res; +} + +/** \brief Append a new field to an union description */ +void gras_datadesc_union_append(gras_datadesc_type_t union_type, + const char *name, + gras_datadesc_type_t field_type) +{ + + gras_dd_cat_field_t field; + int arch; + + XBT_IN3("(%s %s.%s;)", field_type->name, union_type->name, name); + xbt_assert1(field_type->size[GRAS_THISARCH] >= 0, + "Cannot add a dynamically sized field in union %s", + union_type->name); + + if (union_type->category.union_data.closed) { + VERB1("Ignoring request to add field to union %s (closed)", + union_type->name); + return; + } + + field = xbt_new0(s_gras_dd_cat_field_t, 1); + + field->name = (char *) strdup(name); + field->type = field_type; + /* All offset are left to 0 in an union */ + + xbt_dynar_push(union_type->category.union_data.fields, &field); + + for (arch = 0; arch < gras_arch_count; arch++) { + union_type->size[arch] = max(union_type->size[arch], + field_type->size[arch]); + union_type->alignment[arch] = max(union_type->alignment[arch], + field_type->alignment[arch]); + union_type->aligned_size[arch] = ddt_aligned(union_type->size[arch], + union_type->alignment[arch]); + } +} + + +/** \brief Close an union description + * + * No new field can be added afterward, and it is mandatory to close the union before using it. + */ +void gras_datadesc_union_close(gras_datadesc_type_t union_type) +{ + union_type->category.union_data.closed = 1; +} + +/** \brief Copy a type under another name + * + * This may reveal useful to circumvent parsing macro limitations + */ +gras_datadesc_type_t +gras_datadesc_copy(const char *name, gras_datadesc_type_t copied) +{ + + gras_datadesc_type_t res = gras_ddt_new(name); + char *name_cpy = res->name; + + memcpy(res, copied, sizeof(s_gras_datadesc_type_t)); + res->name = name_cpy; + return res; +} + +/** \brief Declare a new type being a reference to the one passed in arg */ +gras_datadesc_type_t +gras_datadesc_ref(const char *name, gras_datadesc_type_t referenced_type) +{ + + gras_datadesc_type_t res; + gras_datadesc_type_t pointer_type = gras_datadesc_by_name("data pointer"); + int arch; + + XBT_IN1("(%s)", name); + res = gras_datadesc_by_name_or_null(name); + if (res) { + xbt_assert1(res->category_code == e_gras_datadesc_type_cat_ref, + "Redefinition of %s does not match", name); + xbt_assert1(res->category.ref_data.type == referenced_type, + "Redefinition of %s does not match", name); + xbt_assert1(res->category.ref_data.selector == NULL, + "Redefinition of %s does not match", name); + VERB1("Discarding redefinition of %s", name); + return res; + } + + res = gras_ddt_new(name); + + xbt_assert0(pointer_type, "Cannot get the description of data pointer"); + + for (arch = 0; arch < gras_arch_count; arch++) { + res->size[arch] = pointer_type->size[arch]; + res->alignment[arch] = pointer_type->alignment[arch]; + res->aligned_size[arch] = pointer_type->aligned_size[arch]; + } + + res->category_code = e_gras_datadesc_type_cat_ref; + res->category.ref_data.type = referenced_type; + res->category.ref_data.selector = NULL; + + return res; +} + +/** \brief Declare a new type being a generic reference. + * + * The callback passed in argument is to be used to select which type is currently used. + * So, when GRAS wants to send a generic reference, it passes the current data to the selector + * callback and expects it to return the type description to use. + */ +gras_datadesc_type_t +gras_datadesc_ref_generic(const char *name, gras_datadesc_selector_t selector) +{ + + gras_datadesc_type_t res; + gras_datadesc_type_t pointer_type = gras_datadesc_by_name("data pointer"); + int arch; + + XBT_IN1("(%s)", name); + res = gras_datadesc_by_name_or_null(name); + + if (res) { + xbt_assert1(res->category_code == e_gras_datadesc_type_cat_ref, + "Redefinition of type %s does not match", name); + xbt_assert1(res->category.ref_data.type == NULL, + "Redefinition of type %s does not match", name); + xbt_assert1(res->category.ref_data.selector == selector, + "Redefinition of type %s does not match", name); + VERB1("Discarding redefinition of %s", name); + return res; + } + res = gras_ddt_new(name); + + xbt_assert0(pointer_type, "Cannot get the description of data pointer"); + + for (arch = 0; arch < gras_arch_count; arch++) { + res->size[arch] = pointer_type->size[arch]; + res->alignment[arch] = pointer_type->alignment[arch]; + res->aligned_size[arch] = pointer_type->aligned_size[arch]; + } + + res->category_code = e_gras_datadesc_type_cat_ref; + + res->category.ref_data.type = NULL; + res->category.ref_data.selector = selector; + + return res; +} + +/** \brief Declare a new type being an array of fixed size and content */ +gras_datadesc_type_t +gras_datadesc_array_fixed(const char *name, + gras_datadesc_type_t element_type, + long int fixed_size) +{ + + gras_datadesc_type_t res; + int arch; + + XBT_IN1("(%s)", name); + res = gras_datadesc_by_name_or_null(name); + if (res) { + xbt_assert1(res->category_code == e_gras_datadesc_type_cat_array, + "Redefinition of type %s does not match", name); + + if (res->category.array_data.type != element_type) { + ERROR1("Redefinition of type %s does not match: array elements differ", + name); + gras_datadesc_type_dump(res->category.array_data.type); + gras_datadesc_type_dump(element_type); + } + + xbt_assert1(res->category.array_data.fixed_size == fixed_size, + "Redefinition of type %s does not match", name); + xbt_assert1(res->category.array_data.dynamic_size == NULL, + "Redefinition of type %s does not match", name); + VERB1("Discarding redefinition of %s", name); + + return res; + } + res = gras_ddt_new(name); + + xbt_assert1(fixed_size >= 0, "'%s' is a array of negative fixed size", + name); + for (arch = 0; arch < gras_arch_count; arch++) { + res->size[arch] = fixed_size * element_type->aligned_size[arch]; + res->alignment[arch] = element_type->alignment[arch]; + res->aligned_size[arch] = res->size[arch]; + } + + res->category_code = e_gras_datadesc_type_cat_array; + + res->category.array_data.type = element_type; + res->category.array_data.fixed_size = fixed_size; + res->category.array_data.dynamic_size = NULL; + + return res; +} + +/** \brief Declare a new type being an array of fixed size, but accepting several content types. */ +gras_datadesc_type_t gras_datadesc_array_dyn(const char *name, + gras_datadesc_type_t + element_type, + gras_datadesc_type_cb_int_t + dynamic_size) +{ + + gras_datadesc_type_t res; + int arch; + + XBT_IN1("(%s)", name); + xbt_assert1(dynamic_size, + "'%s' is a dynamic array without size discriminant", name); + + res = gras_datadesc_by_name_or_null(name); + if (res) { + xbt_assert1(res->category_code == e_gras_datadesc_type_cat_array, + "Redefinition of type %s does not match", name); + xbt_assert1(res->category.array_data.type == element_type, + "Redefinition of type %s does not match", name); + xbt_assert1(res->category.array_data.fixed_size == -1, + "Redefinition of type %s does not match", name); + xbt_assert1(res->category.array_data.dynamic_size == dynamic_size, + "Redefinition of type %s does not match", name); + VERB1("Discarding redefinition of %s", name); + + return res; + } + + res = gras_ddt_new(name); + + for (arch = 0; arch < gras_arch_count; arch++) { + res->size[arch] = 0; /* make sure it indicates "dynamic" */ + res->alignment[arch] = element_type->alignment[arch]; + res->aligned_size[arch] = 0; /*FIXME: That was so in GS, but looks stupid */ + } + + res->category_code = e_gras_datadesc_type_cat_array; + + res->category.array_data.type = element_type; + res->category.array_data.fixed_size = -1; + res->category.array_data.dynamic_size = dynamic_size; + + return res; +} + +/** \brief Declare a new type being an array which size can be found with \ref gras_cbps_i_pop + * + * Most of the time, you want to include a reference in your structure which + * is a pointer to a dynamic array whose size is fixed by another field of + * your structure. + * + * This case pops up so often that this function was created to take care of + * this case. It creates a dynamic array type whose size is poped from the + * current cbps, and then create a reference to it. + * + * The name of the created datatype will be the name of the element type, with + * '[]*' appended to it. + * + * Then to use it, you just have to make sure that your structure pre-callback + * does push the size of the array in the cbps (using #gras_cbps_i_push), and + * you are set. + * + * But be remember that this is a stack. If you have two different pop_arr, you + * should push the second one first, so that the first one is on the top of the + * list when the first field gets transfered. + * + */ +gras_datadesc_type_t +gras_datadesc_ref_pop_arr(gras_datadesc_type_t element_type) +{ + + gras_datadesc_type_t res,ddt2; + char *name = (char *) xbt_malloc(strlen(element_type->name) + 4); + + sprintf(name, "%s[]", element_type->name); + /* Make sure we are not trying to redefine a ddt with the same name */ + ddt2 = gras_datadesc_by_name_or_null(name); + int cpt=0; + while (ddt2) { + free(name); + name=bprintf("%s[]_%d",element_type->name,cpt++); + ddt2=gras_datadesc_by_name_or_null(name); + } + + res = gras_datadesc_array_dyn(name, element_type, gras_datadesc_cb_pop); + + sprintf(name, "%s[]*", element_type->name); + cpt=0; + ddt2 = gras_datadesc_by_name_or_null(name); + while (ddt2) { + free(name); + name=bprintf("%s[]*_%d",element_type->name,cpt++); + ddt2=gras_datadesc_by_name_or_null(name); + } + + res = gras_datadesc_ref(name, res); + + free(name); + + return res; +} + +/* + *## + *## Constructor of container datatypes + *## + */ + +static void gras_datadesc_dynar_cb(gras_datadesc_type_t typedesc, + gras_cbps_t vars, void *data) +{ + gras_datadesc_type_t subtype; + xbt_dynar_t dynar = (xbt_dynar_t) data; + + memcpy(&dynar->free_f, &typedesc->extra, sizeof(dynar->free_f)); + + /* search for the elemsize in what we have. If elements are "int", typedesc got is "int[]*" */ + subtype = gras_dd_find_field(typedesc, "data")->type; + + /* this is now a ref to array of what we're looking for */ + subtype = subtype->category.ref_data.type; + subtype = subtype->category.array_data.type; + + DEBUG1("subtype is %s", subtype->name); + + dynar->elmsize = subtype->size[GRAS_THISARCH]; + dynar->size = dynar->used; + dynar->mutex = NULL; +} + +/** \brief Declare a new type being a dynar in which each elements are of the given type + * + * The type gets registered under the name "dynar(%s)_s", where %s is the name of the subtype. + * For example, a dynar of doubles will be called "dynar(double)_s" and a dynar of dynar of + * strings will be called "dynar(dynar(string)_s)_s". + * + * \param elm_t: the datadesc of the elements + * \param free_func: the function to use to free the elements when the dynar gets freed + */ +gras_datadesc_type_t +gras_datadesc_dynar(gras_datadesc_type_t elm_t, void_f_pvoid_t free_func) +{ + + char *buffname; + gras_datadesc_type_t res; + + asprintf(&buffname, "s_xbt_dynar_of_%s", elm_t->name); + + res = gras_datadesc_struct(buffname); + + gras_datadesc_struct_append(res, "size", + gras_datadesc_by_name("unsigned long int")); + + gras_datadesc_struct_append(res, "used", + gras_datadesc_by_name("unsigned long int")); + + gras_datadesc_struct_append(res, "elmsize", + gras_datadesc_by_name("unsigned long int")); + + gras_datadesc_struct_append(res, "data", gras_datadesc_ref_pop_arr(elm_t)); + + gras_datadesc_struct_append(res, "free_f", + gras_datadesc_by_name("function pointer")); + memcpy(res->extra, &free_func, sizeof(free_func)); + + gras_datadesc_struct_append(res, "mutex", + gras_datadesc_by_name("data pointer")); + + gras_datadesc_struct_close(res); + + gras_datadesc_cb_field_push(res, "used"); + gras_datadesc_cb_recv(res, &gras_datadesc_dynar_cb); + + /* build a ref to it */ + free(buffname); + asprintf(&buffname, "xbt_dynar_of_%s", elm_t->name); + res = gras_datadesc_ref(buffname, res); + free(buffname); + return res; +} + +#include "xbt/matrix.h" +static void gras_datadesc_matrix_cb(gras_datadesc_type_t typedesc, + gras_cbps_t vars, void *data) +{ + gras_datadesc_type_t subtype; + xbt_matrix_t matrix = (xbt_matrix_t) data; + + memcpy(&matrix->free_f, &typedesc->extra, sizeof(matrix->free_f)); + + /* search for the elemsize in what we have. If elements are "int", typedesc got is "int[]*" */ + subtype = gras_dd_find_field(typedesc, "data")->type; + + /* this is now a ref to array of what we're looking for */ + subtype = subtype->category.ref_data.type; + subtype = subtype->category.array_data.type; + + DEBUG1("subtype is %s", subtype->name); + + matrix->elmsize = subtype->size[GRAS_THISARCH]; +} + +gras_datadesc_type_t +gras_datadesc_matrix(gras_datadesc_type_t elm_t, void_f_pvoid_t const free_f) +{ + char *buffname; + gras_datadesc_type_t res; + + asprintf(&buffname, "s_xbt_matrix_t(%s)", elm_t->name); + res = gras_datadesc_struct(buffname); + + gras_datadesc_struct_append(res, "lines", + gras_datadesc_by_name("unsigned int")); + gras_datadesc_struct_append(res, "rows", + gras_datadesc_by_name("unsigned int")); + + gras_datadesc_struct_append(res, "elmsize", + gras_datadesc_by_name("unsigned long int")); + + gras_datadesc_struct_append(res, "data", gras_datadesc_ref_pop_arr(elm_t)); + gras_datadesc_struct_append(res, "free_f", + gras_datadesc_by_name("function pointer")); + gras_datadesc_struct_close(res); + + gras_datadesc_cb_field_push(res, "lines"); + gras_datadesc_cb_field_push_multiplier(res, "rows"); + + gras_datadesc_cb_recv(res, &gras_datadesc_matrix_cb); + memcpy(res->extra, &free_f, sizeof(free_f)); + + /* build a ref to it */ + free(buffname); + asprintf(&buffname, "xbt_matrix_t(%s)", elm_t->name); + res = gras_datadesc_ref(buffname, res); + free(buffname); + return res; +} + +gras_datadesc_type_t +gras_datadesc_import_nws(const char *name, + const DataDescriptor * desc, unsigned long howmany) +{ + THROW_UNIMPLEMENTED; +} + +/** + * (useful to push the sizes of the upcoming arrays, for example) + */ +void gras_datadesc_cb_send(gras_datadesc_type_t type, + gras_datadesc_type_cb_void_t send) +{ + type->send = send; +} + +/** + * (useful to put the function pointers to the rigth value, for example) + */ +void gras_datadesc_cb_recv(gras_datadesc_type_t type, + gras_datadesc_type_cb_void_t recv) +{ + type->recv = recv; +} + +/* + * gras_dd_find_field: + * + * Returns the type descriptor of the given field. Abort on error. + */ +static gras_dd_cat_field_t +gras_dd_find_field(gras_datadesc_type_t type, const char *field_name) +{ + xbt_dynar_t field_array; + + gras_dd_cat_field_t field = NULL; + unsigned int field_num; + + if (type->category_code == e_gras_datadesc_type_cat_union) { + field_array = type->category.union_data.fields; + } else if (type->category_code == e_gras_datadesc_type_cat_struct) { + field_array = type->category.struct_data.fields; + } else { + ERROR2("%s (%p) is not a struct nor an union. There is no field.", + type->name, (void *) type); + xbt_abort(); + } + xbt_dynar_foreach(field_array, field_num, field) { + if (!strcmp(field_name, field->name)) { + return field; + } + } + ERROR2("No field named '%s' in '%s'", field_name, type->name); + xbt_abort(); + +} + +/** + * The given datadesc must be a struct or union (abort if not). + * (useful to push the sizes of the upcoming arrays, for example) + */ +void gras_datadesc_cb_field_send(gras_datadesc_type_t type, + const char *field_name, + gras_datadesc_type_cb_void_t send) +{ + + gras_dd_cat_field_t field = gras_dd_find_field(type, field_name); + field->send = send; +} + + +/** + * The value, which must be an int, unsigned int, long int or unsigned long int + * is pushed to the stacks of sizes and can then be retrieved with + * \ref gras_datadesc_ref_pop_arr or directly with \ref gras_cbps_i_pop. + */ +void gras_datadesc_cb_field_push(gras_datadesc_type_t type, + const char *field_name) +{ + + gras_dd_cat_field_t field = gras_dd_find_field(type, field_name); + gras_datadesc_type_t sub_type = field->type; + + DEBUG3("add a PUSHy cb to '%s' field (type '%s') of '%s'", + field_name, sub_type->name, type->name); + if (!strcmp("int", sub_type->name)) { + field->send = gras_datadesc_cb_push_int; + } else if (!strcmp("unsigned int", sub_type->name)) { + field->send = gras_datadesc_cb_push_uint; + } else if (!strcmp("long int", sub_type->name)) { + field->send = gras_datadesc_cb_push_lint; + } else if (!strcmp("unsigned long int", sub_type->name)) { + field->send = gras_datadesc_cb_push_ulint; + } else { + ERROR1 + ("Field %s is not an int, unsigned int, long int neither unsigned long int", + sub_type->name); + xbt_abort(); + } +} + +/** + * Any previously pushed value is poped and the field value is multiplied to + * it. The result is then pushed back into the stack of sizes. It can then be + * retrieved with \ref gras_datadesc_ref_pop_arr or directly with \ref + * gras_cbps_i_pop. + * + * The field must be an int, unsigned int, long int or unsigned long int. + */ +void gras_datadesc_cb_field_push_multiplier(gras_datadesc_type_t type, + const char *field_name) +{ + + gras_dd_cat_field_t field = gras_dd_find_field(type, field_name); + gras_datadesc_type_t sub_type = field->type; + + DEBUG3("add a MPUSHy cb to '%s' field (type '%s') of '%s'", + field_name, sub_type->name, type->name); + if (!strcmp("int", sub_type->name)) { + field->send = gras_datadesc_cb_push_int_mult; + } else if (!strcmp("unsigned int", sub_type->name)) { + field->send = gras_datadesc_cb_push_uint_mult; + } else if (!strcmp("long int", sub_type->name)) { + field->send = gras_datadesc_cb_push_lint_mult; + } else if (!strcmp("unsigned long int", sub_type->name)) { + field->send = gras_datadesc_cb_push_ulint_mult; + } else { + ERROR1 + ("Field %s is not an int, unsigned int, long int neither unsigned long int", + sub_type->name); + xbt_abort(); + } +} + +/** + * The given datadesc must be a struct or union (abort if not). + * (useful to put the function pointers to the right value, for example) + */ +void gras_datadesc_cb_field_recv(gras_datadesc_type_t type, + const char *field_name, + gras_datadesc_type_cb_void_t recv) +{ + + gras_dd_cat_field_t field = gras_dd_find_field(type, field_name); + field->recv = recv; +} + +/* + * Free a datadesc. Should only be called at xbt_exit. + */ +void gras_datadesc_free(gras_datadesc_type_t * type) +{ + + DEBUG1("Let's free ddt %s", (*type)->name); + + switch ((*type)->category_code) { + case e_gras_datadesc_type_cat_scalar: + case e_gras_datadesc_type_cat_ref: + case e_gras_datadesc_type_cat_array: + /* nothing to free in there */ + break; + + case e_gras_datadesc_type_cat_struct: + xbt_dynar_free(&((*type)->category.struct_data.fields)); + break; + + case e_gras_datadesc_type_cat_union: + xbt_dynar_free(&((*type)->category.union_data.fields)); + break; + + default: + /* datadesc was invalid. Killing it is like euthanasy, I guess */ + break; + } + free((*type)->name); + free(*type); + type = NULL; +} + +/** + * gras_datadesc_type_cmp: + * + * Compares two datadesc types with the same semantic than strcmp. + * + * This comparison does not take the set headers into account (name and ID), + * but only the payload (actual type description). + */ +int gras_datadesc_type_cmp(const gras_datadesc_type_t d1, + const gras_datadesc_type_t d2) +{ + int ret; + unsigned int cpt; + gras_dd_cat_field_t field1, field2; + gras_datadesc_type_t field_desc_1, field_desc_2; + + if (d1 == d2) + return 0; /* easy optimization */ + + if (!d1 && d2) { + DEBUG0("ddt_cmp: !d1 && d2 => 1"); + return 1; + } + if (!d1 && !d2) { + DEBUG0("ddt_cmp: !d1 && !d2 => 0"); + return 0; + } + if (d1 && !d2) { + DEBUG0("ddt_cmp: d1 && !d2 => -1"); + return -1; + } + + for (cpt = 0; cpt < gras_arch_count; cpt++) { + if (d1->size[cpt] != d2->size[cpt]) { + DEBUG5("ddt_cmp: %s->size=%ld != %s->size=%ld (on %s)", + d1->name, d1->size[cpt], d2->name, d2->size[cpt], + gras_arches[cpt].name); + return d1->size[cpt] > d2->size[cpt] ? 1 : -1; + } + + if (d1->alignment[cpt] != d2->alignment[cpt]) { + DEBUG5("ddt_cmp: %s->alignment=%ld != %s->alignment=%ld (on %s)", + d1->name, d1->alignment[cpt], d2->name, d2->alignment[cpt], + gras_arches[cpt].name); + return d1->alignment[cpt] > d2->alignment[cpt] ? 1 : -1; + } + + if (d1->aligned_size[cpt] != d2->aligned_size[cpt]) { + DEBUG5 + ("ddt_cmp: %s->aligned_size=%ld != %s->aligned_size=%ld (on %s)", + d1->name, d1->aligned_size[cpt], d2->name, d2->aligned_size[cpt], + gras_arches[cpt].name); + return d1->aligned_size[cpt] > d2->aligned_size[cpt] ? 1 : -1; + } + } + + if (d1->category_code != d2->category_code) { + DEBUG4("ddt_cmp: %s->cat=%s != %s->cat=%s", + d1->name, gras_datadesc_cat_names[d1->category_code], + d2->name, gras_datadesc_cat_names[d2->category_code]); + return d1->category_code > d2->category_code ? 1 : -1; + } + + if (d1->send != d2->send) { + DEBUG4("ddt_cmp: %s->send=%p != %s->send=%p", + d1->name, (void *) d1->send, d2->name, (void *) d2->send); + return 1; /* ISO C forbids ordered comparisons of pointers to functions */ + } + + if (d1->recv != d2->recv) { + DEBUG4("ddt_cmp: %s->recv=%p != %s->recv=%p", + d1->name, (void *) d1->recv, d2->name, (void *) d2->recv); + return 1; /* ISO C forbids ordered comparisons of pointers to functions */ + } + + switch (d1->category_code) { + case e_gras_datadesc_type_cat_scalar: + if (d1->category.scalar_data.encoding != + d2->category.scalar_data.encoding) + return d1->category.scalar_data.encoding > + d2->category.scalar_data.encoding ? 1 : -1; + break; + + case e_gras_datadesc_type_cat_struct: + if (xbt_dynar_length(d1->category.struct_data.fields) != + xbt_dynar_length(d2->category.struct_data.fields)) { + DEBUG4("ddt_cmp: %s (having %lu fields) != %s (having %lu fields)", + d1->name, xbt_dynar_length(d1->category.struct_data.fields), + d2->name, xbt_dynar_length(d2->category.struct_data.fields)); + + return xbt_dynar_length(d1->category.struct_data.fields) > + xbt_dynar_length(d2->category.struct_data.fields) ? 1 : -1; + } + xbt_dynar_foreach(d1->category.struct_data.fields, cpt, field1) { + + field2 = + xbt_dynar_get_as(d2->category.struct_data.fields, cpt, + gras_dd_cat_field_t); + field_desc_1 = field1->type; + field_desc_2 = field2->type; + ret = gras_datadesc_type_cmp(field_desc_1, field_desc_2); + if (ret) { + DEBUG6("%s->field[%d]=%s != %s->field[%d]=%s", + d1->name, cpt, field1->name, d2->name, cpt, field2->name); + return ret; + } + + } + break; + + case e_gras_datadesc_type_cat_union: + if (d1->category.union_data.selector != d2->category.union_data.selector) + return 1; /* ISO C forbids ordered comparisons of pointers to functions */ + + if (xbt_dynar_length(d1->category.union_data.fields) != + xbt_dynar_length(d2->category.union_data.fields)) + return xbt_dynar_length(d1->category.union_data.fields) > + xbt_dynar_length(d2->category.union_data.fields) ? 1 : -1; + + xbt_dynar_foreach(d1->category.union_data.fields, cpt, field1) { + + field2 = + xbt_dynar_get_as(d2->category.union_data.fields, cpt, + gras_dd_cat_field_t); + field_desc_1 = field1->type; + field_desc_2 = field2->type; + ret = gras_datadesc_type_cmp(field_desc_1, field_desc_2); + if (ret) + return ret; + + } + break; + + + case e_gras_datadesc_type_cat_ref: + if (d1->category.ref_data.selector != d2->category.ref_data.selector) + return 1; /* ISO C forbids ordered comparisons of pointers to functions */ + + if (d1->category.ref_data.type != d2->category.ref_data.type) + return d1->category.ref_data.type > d2->category.ref_data.type ? 1 : -1; + break; + + case e_gras_datadesc_type_cat_array: + if (d1->category.array_data.type != d2->category.array_data.type) + return d1->category.array_data.type > + d2->category.array_data.type ? 1 : -1; + + if (d1->category.array_data.fixed_size != + d2->category.array_data.fixed_size) + return d1->category.array_data.fixed_size > + d2->category.array_data.fixed_size ? 1 : -1; + + if (d1->category.array_data.dynamic_size != + d2->category.array_data.dynamic_size) + return 1; /* ISO C forbids ordered comparisons of pointers to functions */ + + break; + + default: + /* two stupidly created ddt are equally stupid ;) */ + break; + } + return 0; + +} diff --git a/src/xbt/heap.c b/src/xbt/heap.c index ed69bc7bba..80327379f6 100644 --- a/src/xbt/heap.c +++ b/src/xbt/heap.c @@ -1,229 +1,229 @@ -/* a generic and efficient heap */ - -/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "heap_private.h" - -#include - - -/** @addtogroup XBT_heap - * \brief This section describes the API to generic heap with O(log(n)) access. - */ - -/** - * @brief Creates a new heap. - * \param init_size initial size of the heap - * \param free_func function to call on each element when you want to free - * the whole heap (or NULL if nothing to do). - * - * Creates a new heap. - */ -XBT_INLINE xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t const free_func) -{ - xbt_heap_t H = xbt_new0(struct xbt_heap, 1); - H->size = init_size; - H->count = 0; - H->items = (xbt_heapItem_t) xbt_new0(struct xbt_heapItem, init_size); - H->free = free_func; - return H; -} - -/** - * @brief Set the update callback function. - * @param H the heap we're working on - * \param update_callback function to call on each element to update its index when needed. - */ -XBT_INLINE void xbt_heap_set_update_callback(xbt_heap_t H, - void (*update_callback) (void *, int)) -{ - H->update_callback = update_callback; -} - - -/** - * @brief kilkil a heap and its content - * @param H poor victim - */ -void xbt_heap_free(xbt_heap_t H) -{ - int i; - if (H->free) - for (i = 0; i < H->count; i++) - (*(H->free)) (H->items[i].content); - free(H->items); - free(H); - return; -} - -/** - * @brief returns the number of elements in the heap - * @param H the heap we're working on - * @return the number of elements in the heap - */ -XBT_INLINE int xbt_heap_size(xbt_heap_t H) -{ - return (H->count); -} - -/** - * @brief Add an element into the heap. - * \param H the heap we're working on - * \param content the object you want to add to the heap - * \param key the key associated to this object - * - * The element with the smallest key is automatically moved at the top of the heap. - */ -void xbt_heap_push(xbt_heap_t H, void *content, double key) -{ - int count = ++(H->count); - - int size = H->size; - xbt_heapItem_t item; - - if (count > size) { - H->size = 2 * size + 1; - H->items = - (void *) realloc(H->items, (H->size) * sizeof(struct xbt_heapItem)); - } - - item = &(H->items[count - 1]); - item->key = key; - item->content = content; - xbt_heap_increaseKey(H, count - 1); - return; -} - -/** - * @brief Extracts from the heap and returns the element with the smallest key. - * \param H the heap we're working on - * \return the element with the smallest key - * - * Extracts from the heap and returns the element with the smallest - * key. The element with the next smallest key is automatically moved - * at the top of the heap. - */ -void *xbt_heap_pop(xbt_heap_t H) -{ - void *max; - - if (H->count == 0) - return NULL; - - max = CONTENT(H, 0); - - H->items[0] = H->items[(H->count) - 1]; - (H->count)--; - xbt_heap_maxHeapify(H); - if (H->count < H->size / 4 && H->size > 16) { - H->size = H->size / 2 + 1; - H->items = - (void *) realloc(H->items, (H->size) * sizeof(struct xbt_heapItem)); - } - - if(H->update_callback) H->update_callback(max, -1); - return max; -} - -/** - * @brief Extracts from the heap and returns the element at position i. - * \param H the heap we're working on - * \param i element position - * \return the element at position i if ok, NULL otherwise - * - * Extracts from the heap and returns the element at position i. The head is automatically reorded. - */ -void *xbt_heap_remove(xbt_heap_t H, int i) -{ - if ((i < 0) || (i > H->count - 1)) - return NULL; - /* put element i at head */ - if (i > 0) { - KEY(H, i) = MIN_KEY_VALUE; - xbt_heap_increaseKey(H, i); - } - - return xbt_heap_pop(H); -} - -/** - * @brief returns the smallest key in the heap (heap unchanged) - * \param H the heap we're working on - * - * \return the smallest key in the heap without modifying the heap. - */ -XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H) -{ - xbt_assert0(H->count != 0, "Empty heap"); - return KEY(H, 0); -} - -/** - * @brief returns the value associated to the smallest key in the heap (heap unchanged) - * \param H the heap we're working on - * - * \return the value associated to the smallest key in the heap - * without modifying the heap. - */ -void *xbt_heap_maxcontent(xbt_heap_t H) -{ - xbt_assert0(H->count != 0, "Empty heap"); - return CONTENT(H, 0); -} - -/* <<<< private >>>> - * \param H the heap we're working on - * - * Restores the heap property once an element has been deleted. - */ -static void xbt_heap_maxHeapify(xbt_heap_t H) -{ - int i = 0; - while (1) { - int greatest = i; - int l = LEFT(i); - int r = RIGHT(i); - int count = H->count; - if (l < count && KEY(H, l) < KEY(H, i)) - greatest = l; - if (r < count && KEY(H, r) < KEY(H, greatest)) - greatest = r; - if (greatest != i) { - struct xbt_heapItem tmp = H->items[i]; - H->items[i] = H->items[greatest]; - H->items[greatest] = tmp; - if(H->update_callback) H->update_callback(CONTENT(H, i), i); - i = greatest; - } else { - if(H->update_callback) H->update_callback(CONTENT(H, i), i); - return; - } - } -} - -/* <<<< private >>>> - * \param H the heap we're working on - * \param i an item position in the heap - * - * Moves up an item at position i to its correct position. Works only - * when called from xbt_heap_push. Do not use otherwise. - */ -static void xbt_heap_increaseKey(xbt_heap_t H, int i) -{ - while (i > 0 && KEY(H, PARENT(i)) > KEY(H, i)) { - struct xbt_heapItem tmp = H->items[i]; - H->items[i] = H->items[PARENT(i)]; - H->items[PARENT(i)] = tmp; - if(H->update_callback) H->update_callback(CONTENT(H, i), i); - i = PARENT(i); - } - if(H->update_callback) H->update_callback(CONTENT(H, i), i); - return; -} - +/* a generic and efficient heap */ + +/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "xbt/sysdep.h" +#include "xbt/log.h" +#include "heap_private.h" + +#include + + +/** @addtogroup XBT_heap + * \brief This section describes the API to generic heap with O(log(n)) access. + */ + +/** + * @brief Creates a new heap. + * \param init_size initial size of the heap + * \param free_func function to call on each element when you want to free + * the whole heap (or NULL if nothing to do). + * + * Creates a new heap. + */ +XBT_INLINE xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t const free_func) +{ + xbt_heap_t H = xbt_new0(struct xbt_heap, 1); + H->size = init_size; + H->count = 0; + H->items = (xbt_heapItem_t) xbt_new0(struct xbt_heapItem, init_size); + H->free = free_func; + return H; +} + +/** + * @brief Set the update callback function. + * @param H the heap we're working on + * \param update_callback function to call on each element to update its index when needed. + */ +XBT_INLINE void xbt_heap_set_update_callback(xbt_heap_t H, + void (*update_callback) (void *, int)) +{ + H->update_callback = update_callback; +} + + +/** + * @brief kilkil a heap and its content + * @param H poor victim + */ +void xbt_heap_free(xbt_heap_t H) +{ + int i; + if (H->free) + for (i = 0; i < H->count; i++) + (*(H->free)) (H->items[i].content); + free(H->items); + free(H); + return; +} + +/** + * @brief returns the number of elements in the heap + * @param H the heap we're working on + * @return the number of elements in the heap + */ +XBT_INLINE int xbt_heap_size(xbt_heap_t H) +{ + return (H->count); +} + +/** + * @brief Add an element into the heap. + * \param H the heap we're working on + * \param content the object you want to add to the heap + * \param key the key associated to this object + * + * The element with the smallest key is automatically moved at the top of the heap. + */ +void xbt_heap_push(xbt_heap_t H, void *content, double key) +{ + int count = ++(H->count); + + int size = H->size; + xbt_heapItem_t item; + + if (count > size) { + H->size = 2 * size + 1; + H->items = + (void *) realloc(H->items, (H->size) * sizeof(struct xbt_heapItem)); + } + + item = &(H->items[count - 1]); + item->key = key; + item->content = content; + xbt_heap_increaseKey(H, count - 1); + return; +} + +/** + * @brief Extracts from the heap and returns the element with the smallest key. + * \param H the heap we're working on + * \return the element with the smallest key + * + * Extracts from the heap and returns the element with the smallest + * key. The element with the next smallest key is automatically moved + * at the top of the heap. + */ +void *xbt_heap_pop(xbt_heap_t H) +{ + void *max; + + if (H->count == 0) + return NULL; + + max = CONTENT(H, 0); + + H->items[0] = H->items[(H->count) - 1]; + (H->count)--; + xbt_heap_maxHeapify(H); + if (H->count < H->size / 4 && H->size > 16) { + H->size = H->size / 2 + 1; + H->items = + (void *) realloc(H->items, (H->size) * sizeof(struct xbt_heapItem)); + } + + H->update_callback ? H->update_callback(max, -1) : NULL; + return max; +} + +/** + * @brief Extracts from the heap and returns the element at position i. + * \param H the heap we're working on + * \param i element position + * \return the element at position i if ok, NULL otherwise + * + * Extracts from the heap and returns the element at position i. The head is automatically reorded. + */ +void *xbt_heap_remove(xbt_heap_t H, int i) +{ + if ((i < 0) || (i > H->count - 1)) + return NULL; + /* put element i at head */ + if (i > 0) { + KEY(H, i) = MIN_KEY_VALUE; + xbt_heap_increaseKey(H, i); + } + + return xbt_heap_pop(H); +} + +/** + * @brief returns the smallest key in the heap (heap unchanged) + * \param H the heap we're working on + * + * \return the smallest key in the heap without modifying the heap. + */ +XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H) +{ + xbt_assert0(H->count != 0, "Empty heap"); + return KEY(H, 0); +} + +/** + * @brief returns the value associated to the smallest key in the heap (heap unchanged) + * \param H the heap we're working on + * + * \return the value associated to the smallest key in the heap + * without modifying the heap. + */ +void *xbt_heap_maxcontent(xbt_heap_t H) +{ + xbt_assert0(H->count != 0, "Empty heap"); + return CONTENT(H, 0); +} + +/* <<<< private >>>> + * \param H the heap we're working on + * + * Restores the heap property once an element has been deleted. + */ +static void xbt_heap_maxHeapify(xbt_heap_t H) +{ + int i = 0; + while (1) { + int greatest = i; + int l = LEFT(i); + int r = RIGHT(i); + int count = H->count; + if (l < count && KEY(H, l) < KEY(H, i)) + greatest = l; + if (r < count && KEY(H, r) < KEY(H, greatest)) + greatest = r; + if (greatest != i) { + struct xbt_heapItem tmp = H->items[i]; + H->items[i] = H->items[greatest]; + H->items[greatest] = tmp; + H->update_callback ? H->update_callback(CONTENT(H, i), i) : NULL; + i = greatest; + } else { + H->update_callback ? H->update_callback(CONTENT(H, i), i) : NULL; + return; + } + } +} + +/* <<<< private >>>> + * \param H the heap we're working on + * \param i an item position in the heap + * + * Moves up an item at position i to its correct position. Works only + * when called from xbt_heap_push. Do not use otherwise. + */ +static void xbt_heap_increaseKey(xbt_heap_t H, int i) +{ + while (i > 0 && KEY(H, PARENT(i)) > KEY(H, i)) { + struct xbt_heapItem tmp = H->items[i]; + H->items[i] = H->items[PARENT(i)]; + H->items[PARENT(i)] = tmp; + H->update_callback ? H->update_callback(CONTENT(H, i), i) : NULL; + i = PARENT(i); + } + H->update_callback ? H->update_callback(CONTENT(H, i), i) : NULL; + return; +} + diff --git a/src/xbt/setset.c b/src/xbt/setset.c index 5c63ee009a..a583713620 100644 --- a/src/xbt/setset.c +++ b/src/xbt/setset.c @@ -45,10 +45,9 @@ void xbt_setset_elm_add(xbt_setset_t setset, void *obj) { xbt_setset_elm_entry_t new_entry = NULL; xbt_setset_elm_t e = (xbt_setset_elm_t)obj; - xbt_setset_elm_entry_t first_elm = NULL; - xbt_assert0(e->ID == 0, "Adding element with non NULL ID"); - first_elm = (xbt_setset_elm_entry_t)xbt_dynar_get_ptr(setset->elm_array, 0); + xbt_setset_elm_entry_t first_elm = + (xbt_setset_elm_entry_t)xbt_dynar_get_ptr(setset->elm_array, 0); /* Before create a new elm entry check if there is one in the free elm list. */ /* If there is not free elm entries, then create a new one */ @@ -357,4 +356,4 @@ int bitcount(int v) v = v - ((v >> 1) & 0x55555555); // reuse input as temporary v = (v & 0x33333333) + ((v >> 2) & 0x33333333); // temp return (((v + (v >> 4)) & 0xF0F0F0F) * 0x1010101) >> 24; // count -} +} \ No newline at end of file diff --git a/src/xbt/xbt_log_layout_simple.c b/src/xbt/xbt_log_layout_simple.c index 6d94aeab78..277ea18e6c 100644 --- a/src/xbt/xbt_log_layout_simple.c +++ b/src/xbt/xbt_log_layout_simple.c @@ -1,131 +1,130 @@ -/* layout_simple - a dumb log layout */ - -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#include "xbt/sysdep.h" -#include "xbt/strbuff.h" /* For dynamic version when the static one fails */ -#include "xbt/log_private.h" -#include "xbt/synchro.h" /* xbt_thread_name */ - -#include "gras/virtu.h" -#include -#include "portable.h" - -extern const char *xbt_log_priority_names[8]; -extern int xbt_log_no_loc; - -static double simple_begin_of_time = -1; - -static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l, - xbt_log_event_t ev, - const char *fmt, - xbt_log_appender_t app) -{ - xbt_strbuff_t buff = xbt_strbuff_new(); - char loc_buff[256]; - char *p; - - /* Put every static information in a static buffer, and copy them in the dyn one */ - p = loc_buff; - p += snprintf(p, 256 - (p - loc_buff), "["); - - if (strlen(xbt_procname())) - p += snprintf(p, 256 - (p - loc_buff), "%s:%s:(%d) ", - gras_os_myname(), xbt_procname(), (*xbt_getpid) ()); - p += - snprintf(p, 256 - (p - loc_buff), "%f] ", - gras_os_time() - simple_begin_of_time); - if (ev->priority != xbt_log_priority_info && xbt_log_no_loc==0) - p += - snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName, - ev->lineNum); - p += - snprintf(p, 256 - (p - loc_buff), "[%s/%s] ", ev->cat->name, - xbt_log_priority_names[ev->priority]); - - xbt_strbuff_append(buff, loc_buff); - - vasprintf(&p, fmt, ev->ap_copy); - xbt_strbuff_append(buff, p); - free(p); - - xbt_strbuff_append(buff, "\n"); - - app->do_append(app, buff->data); - xbt_strbuff_free(buff); -} - -/* only used after the format using: we suppose that the buffer is big enough to display our data */ -#undef check_overflow -#define check_overflow \ - do {if (p-ev->buffer > XBT_LOG_BUFF_SIZE) { \ - xbt_log_layout_simple_dynamic(l,ev,fmt,app); \ - return ; \ - } } while(0) - -static void xbt_log_layout_simple_doit(xbt_log_layout_t l, - xbt_log_event_t ev, - const char *fmt, - xbt_log_appender_t app) -{ - char *p; - const char *procname=xbt_procname(); - - xbt_assert0(ev->priority >= 0, - "Negative logging priority naturally forbidden"); - xbt_assert1(ev->priority < sizeof(xbt_log_priority_names), - "Priority %d is greater than the biggest allowed value", - ev->priority); - - p = ev->buffer; - p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "["); - check_overflow; - - /* Display the proc info if available */ - - if (strlen(procname)) { - p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ", - gras_os_myname(), procname, (*xbt_getpid) ()); - check_overflow; - } - - /* Display the date */ - p += - snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ", - gras_os_time() - simple_begin_of_time); - check_overflow; - - /* Display file position if not INFO */ - if (ev->priority != xbt_log_priority_info && !xbt_log_no_loc) - p += - snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ", - ev->fileName, ev->lineNum); - - /* Display category name */ - p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[%s/%s] ", - ev->cat->name, xbt_log_priority_names[ev->priority]); - - /* Display user-provided message */ - p += vsnprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), fmt, ev->ap); - check_overflow; - - /* End it */ - p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "\n"); - check_overflow; - app->do_append(app, ev->buffer); -} - -xbt_log_layout_t xbt_log_layout_simple_new(char *arg) -{ - xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1); - res->do_layout = xbt_log_layout_simple_doit; - - if (simple_begin_of_time < 0) - simple_begin_of_time = gras_os_time(); - - return res; -} +/* layout_simple - a dumb log layout */ + +/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "xbt/sysdep.h" +#include "xbt/strbuff.h" /* For dynamic version when the static one fails */ +#include "xbt/log_private.h" +#include "xbt/synchro.h" /* xbt_thread_name */ + +#include "gras/virtu.h" +#include +#include "portable.h" + +extern const char *xbt_log_priority_names[8]; +extern int xbt_log_no_loc; + +static double simple_begin_of_time = -1; + +static void xbt_log_layout_simple_dynamic(xbt_log_layout_t l, + xbt_log_event_t ev, + const char *fmt, + xbt_log_appender_t app) +{ + xbt_strbuff_t buff = xbt_strbuff_new(); + char loc_buff[256]; + char *p; + + /* Put every static information in a static buffer, and copy them in the dyn one */ + p = loc_buff; + p += snprintf(p, 256 - (p - loc_buff), "["); + + if (strlen(xbt_procname())) + p += snprintf(p, 256 - (p - loc_buff), "%s:%s:(%d) ", + gras_os_myname(), xbt_procname(), (*xbt_getpid) ()); + p += + snprintf(p, 256 - (p - loc_buff), "%f] ", + gras_os_time() - simple_begin_of_time); + if (ev->priority != xbt_log_priority_info && xbt_log_no_loc==0) + p += + snprintf(p, 256 - (p - loc_buff), "%s:%d: ", ev->fileName, + ev->lineNum); + p += + snprintf(p, 256 - (p - loc_buff), "[%s/%s] ", ev->cat->name, + xbt_log_priority_names[ev->priority]); + + xbt_strbuff_append(buff, loc_buff); + + vasprintf(&p, fmt, ev->ap_copy); + xbt_strbuff_append(buff, p); + free(p); + + xbt_strbuff_append(buff, "\n"); + + app->do_append(app, buff->data); + xbt_strbuff_free(buff); +} + +/* only used after the format using: we suppose that the buffer is big enough to display our data */ +#undef check_overflow +#define check_overflow \ + if (p-ev->buffer > XBT_LOG_BUFF_SIZE) { /* buffer overflow */ \ + xbt_log_layout_simple_dynamic(l,ev,fmt,app); \ + return; \ + } + +static void xbt_log_layout_simple_doit(xbt_log_layout_t l, + xbt_log_event_t ev, + const char *fmt, + xbt_log_appender_t app) +{ + char *p; + + xbt_assert0(ev->priority >= 0, + "Negative logging priority naturally forbidden"); + xbt_assert1(ev->priority < sizeof(xbt_log_priority_names), + "Priority %d is greater than the biggest allowed value", + ev->priority); + + p = ev->buffer; + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "["); + check_overflow; + + /* Display the proc info if available */ + const char *procname=xbt_procname(); + if (strlen(procname)) { + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%s:(%d) ", + gras_os_myname(), procname, (*xbt_getpid) ()); + check_overflow; + } + + /* Display the date */ + p += + snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%f] ", + gras_os_time() - simple_begin_of_time); + check_overflow; + + /* Display file position if not INFO */ + if (ev->priority != xbt_log_priority_info && !xbt_log_no_loc) + p += + snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "%s:%d: ", + ev->fileName, ev->lineNum); + + /* Display category name */ + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "[%s/%s] ", + ev->cat->name, xbt_log_priority_names[ev->priority]); + + /* Display user-provided message */ + p += vsnprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), fmt, ev->ap); + check_overflow; + + /* End it */ + p += snprintf(p, XBT_LOG_BUFF_SIZE - (p - ev->buffer), "\n"); + check_overflow; + app->do_append(app, ev->buffer); +} + +xbt_log_layout_t xbt_log_layout_simple_new(char *arg) +{ + xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1); + res->do_layout = xbt_log_layout_simple_doit; + + if (simple_begin_of_time < 0) + simple_begin_of_time = gras_os_time(); + + return res; +} diff --git a/src/xbt/xbt_os_time.c b/src/xbt/xbt_os_time.c index 365d127b2c..0345e0f5eb 100644 --- a/src/xbt/xbt_os_time.c +++ b/src/xbt/xbt_os_time.c @@ -1,136 +1,137 @@ -/* xbt_os_time.c -- portable interface to time-related functions */ - -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#include "xbt/sysdep.h" -#include "xbt/xbt_os_time.h" /* this module */ -#include "xbt/log.h" -#include "portable.h" -#include /* floor */ - -#ifdef WIN32 -#include -#endif - -double xbt_os_time(void) -{ -#ifdef HAVE_GETTIMEOFDAY - struct timeval tv; - gettimeofday(&tv, NULL); -#elif defined(WIN32) - struct timeval tv; -# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400) - struct _timeb tm; - - _ftime(&tm); - - tv.tv_sec = tm.time; - tv.tv_usec = tm.millitm * 1000; - -# else - FILETIME ft; - unsigned __int64 tm; - - GetSystemTimeAsFileTime(&ft); - tm = (unsigned __int64) ft.dwHighDateTime << 32; - tm |= ft.dwLowDateTime; - tm /= 10; - tm -= 11644473600000000ULL; - - tv.tv_sec = (long) (tm / 1000000L); - tv.tv_usec = (long) (tm % 1000000L); -# endif /* windows version checker */ - -#else /* not windows, no gettimeofday => poor resolution */ - return (double) (time(NULL)); -#endif /* HAVE_GETTIMEOFDAY? */ - - return (double) (tv.tv_sec + tv.tv_usec / 1000000.0); -} - -void xbt_os_sleep(double sec) -{ -#ifdef HAVE_USLEEP - sleep(sec); - (void) usleep((sec - floor(sec)) * 1000000); - -#elif WIN32 - Sleep((floor(sec) * 1000) + ((sec - floor(sec)) * 1000)); - -#else /* don't have usleep. Use select to sleep less than one second */ - struct timeval timeout; - - - timeout.tv_sec = (unsigned long) (sec); - timeout.tv_usec = (sec - floor(sec)) * 1000000; - - select(0, NULL, NULL, NULL, &timeout); -#endif -} - -/* TSC (tick-level) timers are said to be unreliable on SMP hosts and thus - disabled in SDL source code */ - - -/* \defgroup XBT_sysdep All system dependency - * \brief This section describes many macros/functions that can serve as - * an OS abstraction. - */ - - -struct s_xbt_os_timer { -#ifdef HAVE_POSIX_GETTIME - struct timespec start, stop; -#elif defined(HAVE_GETTIMEOFDAY) - struct timeval start, stop; -#else - unsigned long int start, stop; -#endif -}; - -xbt_os_timer_t xbt_os_timer_new(void) { - return xbt_new0(struct s_xbt_os_timer, 1); -} - -void xbt_os_timer_free(xbt_os_timer_t timer) { - free(timer); -} - -void xbt_os_timer_start(xbt_os_timer_t timer) { -#ifdef HAVE_POSIX_GETTIME - clock_gettime(CLOCK_PROCESS_CPUTIME_ID,&(timer->start)); -#elif defined(HAVE_GETTIMEOFDAY) - gettimeofday(&(timer->start), NULL); -#else - timer->start = (unsigned long int) (time(NULL)); -#endif -} - -void xbt_os_timer_stop(xbt_os_timer_t timer) { -#ifdef HAVE_POSIX_GETTIME - clock_gettime(CLOCK_PROCESS_CPUTIME_ID,&(timer->stop)); -#elif defined(HAVE_GETTIMEOFDAY) - gettimeofday(&(timer->stop), NULL); -#else - timer->stop = (unsigned long int) (time(NULL)); -#endif -} - -double xbt_os_timer_elapsed(xbt_os_timer_t timer) -{ -#ifdef HAVE_POSIX_GETTIME - return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec) + - ((((double) timer->stop.tv_nsec) - - ((double) timer->start.tv_nsec)) / 1e9); -#elif defined(HAVE_GETTIMEOFDAY) - return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec) + - ((((double) timer->stop.tv_usec) - - ((double) timer->start.tv_usec)) / 1000000.0); -#else - return (double) timer->stop - (double) timer->start; -#endif -} +/* xbt_os_time.c -- portable interface to time-related functions */ + +/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "xbt/sysdep.h" +#include "xbt/xbt_os_time.h" /* this module */ +#include "xbt/log.h" +#include "portable.h" +#include /* floor */ + + +#ifdef WIN32 +#include +#endif + +double xbt_os_time(void) +{ +#ifdef HAVE_GETTIMEOFDAY + struct timeval tv; + gettimeofday(&tv, NULL); +#elif defined(WIN32) + struct timeval tv; +# if defined(WIN32_WCE) || (_WIN32_WINNT < 0x0400) + struct _timeb tm; + + _ftime(&tm); + + tv.tv_sec = tm.time; + tv.tv_usec = tm.millitm * 1000; + +# else + FILETIME ft; + unsigned __int64 tm; + + GetSystemTimeAsFileTime(&ft); + tm = (unsigned __int64) ft.dwHighDateTime << 32; + tm |= ft.dwLowDateTime; + tm /= 10; + tm -= 11644473600000000ULL; + + tv.tv_sec = (long) (tm / 1000000L); + tv.tv_usec = (long) (tm % 1000000L); +# endif /* windows version checker */ + +#else /* not windows, no gettimeofday => poor resolution */ + return (double) (time(NULL)); +#endif /* HAVE_GETTIMEOFDAY? */ + + return (double) (tv.tv_sec + tv.tv_usec / 1000000.0); +} + +void xbt_os_sleep(double sec) +{ +#ifdef HAVE_USLEEP + sleep(sec); + (void) usleep((sec - floor(sec)) * 1000000); + +#elif WIN32 + Sleep((floor(sec) * 1000) + ((sec - floor(sec)) * 1000)); + +#else /* don't have usleep. Use select to sleep less than one second */ + struct timeval timeout; + + + timeout.tv_sec = (unsigned long) (sec); + timeout.tv_usec = (sec - floor(sec)) * 1000000; + + select(0, NULL, NULL, NULL, &timeout); +#endif +} + +/* TSC (tick-level) timers are said to be unreliable on SMP hosts and thus + disabled in SDL source code */ + + +/* \defgroup XBT_sysdep All system dependency + * \brief This section describes many macros/functions that can serve as + * an OS abstraction. + */ + + +struct s_xbt_os_timer { +#ifdef HAVE_POSIX_GETTIME + struct timespec start, stop; +#elif defined(HAVE_GETTIMEOFDAY) + struct timeval start, stop; +#else + unsigned long int start, stop; +#endif +}; + +xbt_os_timer_t xbt_os_timer_new(void) { + return xbt_new0(struct s_xbt_os_timer, 1); +} + +void xbt_os_timer_free(xbt_os_timer_t timer) { + free(timer); +} + +void xbt_os_timer_start(xbt_os_timer_t timer) { +#ifdef HAVE_POSIX_GETTIME + clock_gettime(CLOCK_PROCESS_CPUTIME_ID,&(timer->start)); +#elif defined(HAVE_GETTIMEOFDAY) + gettimeofday(&(timer->start), NULL); +#else + timer->start = (unsigned long int) (time(NULL)); +#endif +} + +void xbt_os_timer_stop(xbt_os_timer_t timer) { +#ifdef HAVE_POSIX_GETTIME + clock_gettime(CLOCK_PROCESS_CPUTIME_ID,&(timer->stop)); +#elif defined(HAVE_GETTIMEOFDAY) + gettimeofday(&(timer->stop), NULL); +#else + timer->stop = (unsigned long int) (time(NULL)); +#endif +} + +double xbt_os_timer_elapsed(xbt_os_timer_t timer) +{ +#ifdef HAVE_POSIX_GETTIME + return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec) + + ((((double) timer->stop.tv_nsec) - + ((double) timer->start.tv_nsec)) / 1e9); +#elif defined(HAVE_GETTIMEOFDAY) + return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec) + + ((((double) timer->stop.tv_usec) - + ((double) timer->start.tv_usec)) / 1000000.0); +#else + return (double) timer->stop - (double) timer->start; +#endif +}