X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e32d1f72606b96bb1abd9af359f1590528ec843..e65bb0d9728e27ef89f57274e60f13e94820d5f9:/include/gras/process.h diff --git a/include/gras/process.h b/include/gras/process.h index 76c2659805..5c7047bbe2 100644 --- a/include/gras/process.h +++ b/include/gras/process.h @@ -3,7 +3,7 @@ /* gras/core.h - Unsorted part of the GRAS public interface */ /* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (C) 2003,2004 the OURAGAN project. */ /* 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. */ @@ -11,29 +11,7 @@ #ifndef GRAS_PROCESS_H #define GRAS_PROCESS_H -#include /* offsetof() */ -#include /* size_t */ -#include - - -/*! C++ users need love */ -#ifndef BEGIN_DECL -# ifdef __cplusplus -# define BEGIN_DECL extern "C" { -# else -# define BEGIN_DECL -# endif -#endif - -/*! C++ users need love */ -#ifndef END_DECL -# ifdef __cplusplus -# define END_DECL } -# else -# define END_DECL -# endif -#endif -/* End of cruft for C++ */ +#include "xbt/misc.h" /* BEGIN_DECL */ BEGIN_DECL @@ -45,14 +23,14 @@ BEGIN_DECL * * Perform the various intialisations needed by gras. Each process must run it */ -gras_error_t gras_process_init(void); +xbt_error_t gras_process_init(void); /** * gras_process_exit: * * Frees the memory allocated by gras. Processes should run it */ -gras_error_t gras_process_exit(void); +xbt_error_t gras_process_exit(void); /****************************************************************************/ /* Manipulating User Data */ @@ -69,7 +47,7 @@ void *gras_userdata_get(void); * * Set the data associated with the current process. */ -void *gras_userdata_set(void *ud); +void gras_userdata_set(void *ud); /** * gras_userdata_new: @@ -77,7 +55,7 @@ void *gras_userdata_set(void *ud); * Malloc and set the data associated with the current process. */ -#define gras_userdata_new(type) gras_userdata_set(malloc(sizeof(type))) +#define gras_userdata_new(type) (gras_userdata_set(xbt_new0(type,1)),gras_userdata_get()) END_DECL