A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new function: gras_socket_meas_accept (mandatory on meas sockets, forbiden on others...
[simgrid.git]
/
src
/
gras
/
DataDesc
/
cbps.c
diff --git
a/src/gras/DataDesc/cbps.c
b/src/gras/DataDesc/cbps.c
index
e37d6fe
..
a9fb374
100644
(file)
--- a/
src/gras/DataDesc/cbps.c
+++ b/
src/gras/DataDesc/cbps.c
@@
-2,11
+2,12
@@
/* cbps - persistant states for callbacks */
/* cbps - persistant states for callbacks */
-/* Authors: Olivier Aumage, Martin Quinson */
-/* Copyright (C) 2003, 2004 da GRAS posse. */
+/* Copyright (c) 2003 Olivier Aumage. */
+/* Copyright (c) 2003, 2004 Martin Quinson. */
+/* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* 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. */
+
*
under the terms of the license (GNU LGPL) which comes with this package. */
#include "gras/DataDesc/datadesc_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_cbps,datadesc,"callback persistant state");
#include "gras/DataDesc/datadesc_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_cbps,datadesc,"callback persistant state");
@@
-28,11
+29,10
@@
typedef struct s_gras_cbps {
static void free_string(void *d);
static void free_string(void *d){
static void free_string(void *d);
static void free_string(void *d){
-
xbt_
free(*(void**)d);
+ free(*(void**)d);
}
gras_cbps_t gras_cbps_new(void) {
}
gras_cbps_t gras_cbps_new(void) {
- xbt_error_t errcode;
gras_cbps_t res;
res=xbt_new(s_gras_cbps_t,1);
gras_cbps_t res;
res=xbt_new(s_gras_cbps_t,1);
@@
-57,14
+57,13
@@
void gras_cbps_free(gras_cbps_t *state) {
xbt_dynar_free( &( (*state)->frames ) );
xbt_dynar_free( &( (*state)->globals ) );
xbt_dynar_free( &( (*state)->frames ) );
xbt_dynar_free( &( (*state)->globals ) );
-
xbt_
free(*state);
+ free(*state);
*state = NULL;
}
*state = NULL;
}
-/**
- * gras_cbps_v_push:
+/** \brief Declare a new element in the PS, and give it a value.
*
*
- *
Declare a new element in the PS, and give it a value.
If an element of that
+ * If an element of that
* name already exists, it is masked by the one given here, and will be
* seeable again only after a pop to remove the value this push adds.
*/
* name already exists, it is masked by the one given here, and will be
* seeable again only after a pop to remove the value this push adds.
*/
@@
-104,10
+103,9
@@
gras_cbps_v_push(gras_cbps_t ps,
return no_error;
}
return no_error;
}
-/**
- * gras_cbps_v_pop:
+/** \brief Retrieve an element from the PS, and remove it from the PS.
*
*
- *
Retrieve an element from the PS, and remove it from the PS.
If it's not
+ * If it's not
* present in the current block, it will fail (with abort) and not search
* in upper blocks since this denotes a programmation error.
*/
* present in the current block, it will fail (with abort) and not search
* in upper blocks since this denotes a programmation error.
*/
@@
-140,7
+138,7
@@
gras_cbps_v_pop (gras_cbps_t ps,
*ddt = var->type;
data = var->data;
*ddt = var->type;
data = var->data;
-
xbt_
free(var);
+ free(var);
xbt_dynar_pop(ps->frames, &frame);
{
xbt_dynar_pop(ps->frames, &frame);
{
@@
-152,7
+150,7
@@
gras_cbps_v_pop (gras_cbps_t ps,
_name = xbt_dynar_get_as(frame, l, char*);
if (!strcmp(name, _name)) {
xbt_dynar_remove_at(frame, l, &_name);
_name = xbt_dynar_get_as(frame, l, char*);
if (!strcmp(name, _name)) {
xbt_dynar_remove_at(frame, l, &_name);
-
xbt_
free(_name);
+ free(_name);
break;
}
}
break;
}
}
@@
-163,10
+161,8
@@
gras_cbps_v_pop (gras_cbps_t ps,
return no_error;
}
return no_error;
}
-/**
- * gras_cbps_v_set:
- *
- * Change the value of an element in the PS.
+/** \brief Change the value of an element in the PS.
+ *
* If it's not present in the current block, look in the upper ones.
* If it's not present in any of them, modify in the globals
* If not present there neither, the code may segfault (Oli?).
* If it's not present in the current block, look in the upper ones.
* If it's not present in any of them, modify in the globals
* If not present there neither, the code may segfault (Oli?).
@@
-204,10
+200,8
@@
gras_cbps_v_set (gras_cbps_t ps,
}
}
-/**
- * gras_cbps_v_get:
- *
- * Get the value of an element in the PS without modifying it.
+/** \brief Get the value of an element in the PS without modifying it.
+ *
* (note that you get the content of the data struct and not a copy to it)
* If it's not present in the current block, look in the upper ones.
* If it's not present in any of them, look in the globals
* (note that you get the content of the data struct and not a copy to it)
* If it's not present in the current block, look in the upper ones.
* If it's not present in any of them, look in the globals
@@
-235,10
+229,7
@@
gras_cbps_v_get (gras_cbps_t ps,
}
}
-/**
- * gras_cbps_block_begin:
- *
- * Begins a new block.
+/** \brief Begins a new block.
*
* Blocks are usefull to remove a whole set of declarations you don't even know
*
*
* Blocks are usefull to remove a whole set of declarations you don't even know
*
@@
-259,11
+250,7
@@
gras_cbps_block_begin(gras_cbps_t ps) {
xbt_dynar_push(ps->frames, &dynar);
}
xbt_dynar_push(ps->frames, &dynar);
}
-/**
- * gras_cbps_block_end:
- *
- * End the current block, and go back to the upper one.
- */
+/** \brief End the current block, and go back to the upper one. */
void
gras_cbps_block_end(gras_cbps_t ps) {
void
gras_cbps_block_end(gras_cbps_t ps) {
@@
-289,32
+276,23
@@
gras_cbps_block_end(gras_cbps_t ps) {
xbt_dynar_free_container(&varstack); /*already empty, save a test ;) */
}
xbt_dynar_free_container(&varstack); /*already empty, save a test ;) */
}
- if (var->data)
xbt_
free(var->data);
-
xbt_
free(var);
-
xbt_
free(name);
+ if (var->data) free(var->data);
+ free(var);
+ free(name);
}
xbt_dynar_free_container(&frame);/* we just emptied it */
DEBUG0("<<< Block end");
}
}
xbt_dynar_free_container(&frame);/* we just emptied it */
DEBUG0("<<< Block end");
}
-/**
- * gras_cbps_i_push:
- *
- * Push a new long integer value into the cbps.
- */
+/** \brief Push a new integer value into the cbps. */
void
gras_cbps_i_push(gras_cbps_t ps,
int val) {
void
gras_cbps_i_push(gras_cbps_t ps,
int val) {
- xbt_error_t errcode;
DEBUG1("push %d as a size",val);
xbt_dynar_push_as(ps->lints,int,val);
}
DEBUG1("push %d as a size",val);
xbt_dynar_push_as(ps->lints,int,val);
}
-/**
- * gras_cbps_i_pop:
- *
- * Pop the lastly pushed long integer value from the cbps.
- */
+/** \brief Pop the lastly pushed integer value from the cbps. */
int
gras_cbps_i_pop(gras_cbps_t ps) {
int ret;
int
gras_cbps_i_pop(gras_cbps_t ps) {
int ret;
@@
-326,50
+304,35
@@
gras_cbps_i_pop(gras_cbps_t ps) {
return ret;
}
return ret;
}
-/**
- * gras_datadesc_cb_pop:
- *
- * Generic cb returning the lastly pushed value
+/** \brief Generic cb returning the lastly pushed value
+ *
+ * Used by \ref gras_datadesc_ref_pop_arr
*/
*/
-int gras_datadesc_cb_pop(gras_cbps_t vars, void *data) {
+int gras_datadesc_cb_pop(gras_
datadesc_type_t ignored, gras_
cbps_t vars, void *data) {
return gras_cbps_i_pop(vars);
}
return gras_cbps_i_pop(vars);
}
-/**
- * gras_datadesc_cb_push_int:
- *
- * Cb to push an integer. Must be attached to the field you want to push
- */
-void gras_datadesc_cb_push_int(gras_cbps_t vars, void *data) {
+/** \brief Cb to push an integer. Must be attached to the field you want to push */
+void gras_datadesc_cb_push_int(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
int *i = (int*)data;
gras_cbps_i_push(vars, (int) *i);
}
int *i = (int*)data;
gras_cbps_i_push(vars, (int) *i);
}
-/**
- * gras_datadesc_cb_push_uint:
- *
- * Cb to push an unsigned integer. Must be attached to the field you want to push
- */
-void gras_datadesc_cb_push_uint(gras_cbps_t vars, void *data) {
+/** \brief Cb to push an unsigned integer. Must be attached to the field you want to push */
+void gras_datadesc_cb_push_uint(gras_datadesc_type_t ignored, gras_cbps_t vars, void *data) {
unsigned int *i = (unsigned int*)data;
gras_cbps_i_push(vars, (int) *i);
}
unsigned int *i = (unsigned int*)data;
gras_cbps_i_push(vars, (int) *i);
}
-/**
- * gras_datadesc_cb_push_lint:
- *
- * Cb to push an long integer. Must be attached to the field you want to push
+/** \brief Cb to push an long integer. Must be attached to the field you want to push
*/
*/
-void gras_datadesc_cb_push_lint(gras_cbps_t vars, void *data) {
+void gras_datadesc_cb_push_lint(gras_
datadesc_type_t ignored, gras_
cbps_t vars, void *data) {
long int *i = (long int*)data;
gras_cbps_i_push(vars, (int) *i);
}
long int *i = (long int*)data;
gras_cbps_i_push(vars, (int) *i);
}
-/**
- * gras_datadesc_cb_push_ulint:
- *
- * Cb to push an long integer. Must be attached to the field you want to push
+/** \brief Cb to push an long integer. Must be attached to the field you want to push
*/
*/
-void gras_datadesc_cb_push_ulint(gras_cbps_t vars, void *data) {
+void gras_datadesc_cb_push_ulint(gras_
datadesc_type_t ignored, gras_
cbps_t vars, void *data) {
unsigned long int *i = (unsigned long int*)data;
gras_cbps_i_push(vars, (int) *i);
}
unsigned long int *i = (unsigned long int*)data;
gras_cbps_i_push(vars, (int) *i);
}