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
Use proper timer; allow several timed sections per file (ie, use the 'line' argument...
[simgrid.git]
/
src
/
gras
/
DataDesc
/
cbps.c
diff --git
a/src/gras/DataDesc/cbps.c
b/src/gras/DataDesc/cbps.c
index
f63f19b
..
9ce129b
100644
(file)
--- a/
src/gras/DataDesc/cbps.c
+++ b/
src/gras/DataDesc/cbps.c
@@
-2,14
+2,15
@@
/* 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"
#include "gras/DataDesc/datadesc_private.h"
-
GRAS
_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_cbps,datadesc,"callback persistant state");
+
XBT
_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_cbps,datadesc,"callback persistant state");
typedef struct {
gras_datadesc_type_t type;
typedef struct {
gras_datadesc_type_t type;
@@
-17,31
+18,30
@@
typedef struct {
} s_gras_cbps_elm_t, *gras_cbps_elm_t;
typedef struct s_gras_cbps {
} s_gras_cbps_elm_t, *gras_cbps_elm_t;
typedef struct s_gras_cbps {
-
gras
_dynar_t lints; /* simple stack of long integers (easy interface) */
+
xbt
_dynar_t lints; /* simple stack of long integers (easy interface) */
-
gras
_dict_t space; /* varname x dynar of gras_cbps_elm_t */
-
gras
_dynar_t frames; /* of dynar of names defined within this frame
+
xbt
_dict_t space; /* varname x dynar of gras_cbps_elm_t */
+
xbt
_dynar_t frames; /* of dynar of names defined within this frame
(and to pop when we leave it) */
(and to pop when we leave it) */
-
gras
_dynar_t globals;
+
xbt
_dynar_t globals;
} s_gras_cbps_t;
static void free_string(void *d);
static void free_string(void *d){
} s_gras_cbps_t;
static void free_string(void *d);
static void free_string(void *d){
-
gras_
free(*(void**)d);
+ free(*(void**)d);
}
gras_cbps_t gras_cbps_new(void) {
}
gras_cbps_t gras_cbps_new(void) {
- gras_error_t errcode;
gras_cbps_t res;
gras_cbps_t res;
- res=
gras
_new(s_gras_cbps_t,1);
+ res=
xbt
_new(s_gras_cbps_t,1);
- res->lints =
gras
_dynar_new(sizeof(int), NULL);
- res->space =
gras
_dict_new();
+ res->lints =
xbt
_dynar_new(sizeof(int), NULL);
+ res->space =
xbt
_dict_new();
/* no leak, the content is freed manually on block_end */
/* no leak, the content is freed manually on block_end */
- res->frames =
gras_dynar_new(sizeof(gras
_dynar_t), NULL);
- res->globals =
gras
_dynar_new(sizeof(char*), NULL);
+ res->frames =
xbt_dynar_new(sizeof(xbt
_dynar_t), NULL);
+ res->globals =
xbt
_dynar_new(sizeof(char*), NULL);
gras_cbps_block_begin(res);
gras_cbps_block_begin(res);
@@
-50,123
+50,119
@@
gras_cbps_t gras_cbps_new(void) {
void gras_cbps_free(gras_cbps_t *state) {
void gras_cbps_free(gras_cbps_t *state) {
-
gras
_dynar_free( &( (*state)->lints ) );
+
xbt
_dynar_free( &( (*state)->lints ) );
gras_cbps_block_end(*state);
gras_cbps_block_end(*state);
-
gras
_dict_free ( &( (*state)->space ) );
-
gras
_dynar_free( &( (*state)->frames ) );
-
gras
_dynar_free( &( (*state)->globals ) );
+
xbt
_dict_free ( &( (*state)->space ) );
+
xbt
_dynar_free( &( (*state)->frames ) );
+
xbt
_dynar_free( &( (*state)->globals ) );
-
gras_
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.
*/
-
gras
_error_t
+
xbt
_error_t
gras_cbps_v_push(gras_cbps_t ps,
const char *name,
void *data,
gras_datadesc_type_t ddt) {
gras_cbps_v_push(gras_cbps_t ps,
const char *name,
void *data,
gras_datadesc_type_t ddt) {
-
gras
_dynar_t varstack,frame;
+
xbt
_dynar_t varstack,frame;
gras_cbps_elm_t var;
gras_cbps_elm_t var;
-
gras
_error_t errcode;
+
xbt
_error_t errcode;
char *varname = (char*)strdup(name);
DEBUG2("push(%s,%p)",name,(void*)data);
char *varname = (char*)strdup(name);
DEBUG2("push(%s,%p)",name,(void*)data);
- errcode =
gras
_dict_get(ps->space, name, (void **)&varstack);
+ errcode =
xbt
_dict_get(ps->space, name, (void **)&varstack);
if (errcode == mismatch_error) {
DEBUG1("Create a new variable stack for '%s' into the space",name);
if (errcode == mismatch_error) {
DEBUG1("Create a new variable stack for '%s' into the space",name);
- varstack =
gras
_dynar_new(sizeof (gras_cbps_elm_t *), NULL);
-
gras
_dict_set(ps->space, varname, (void **)varstack, NULL);
+ varstack =
xbt
_dynar_new(sizeof (gras_cbps_elm_t *), NULL);
+
xbt
_dict_set(ps->space, varname, (void **)varstack, NULL);
/* leaking, you think? only if you do not close all the openned blocks ;)*/
} else if (errcode != no_error) {
return errcode;
}
/* leaking, you think? only if you do not close all the openned blocks ;)*/
} else if (errcode != no_error) {
return errcode;
}
- var =
gras
_new0(s_gras_cbps_elm_t,1);
+ var =
xbt
_new0(s_gras_cbps_elm_t,1);
var->type = ddt;
var->data = data;
var->type = ddt;
var->data = data;
-
gras
_dynar_push(varstack, &var);
+
xbt
_dynar_push(varstack, &var);
-
gras
_dynar_pop(ps->frames, &frame);
+
xbt
_dynar_pop(ps->frames, &frame);
DEBUG4("Push %s (%p @%p) into frame %p",varname,(void*)varname,(void*)&varname,(void*)frame);
DEBUG4("Push %s (%p @%p) into frame %p",varname,(void*)varname,(void*)&varname,(void*)frame);
-
gras
_dynar_push(frame, &varname);
-
gras
_dynar_push(ps->frames, &frame);
+
xbt
_dynar_push(frame, &varname);
+
xbt
_dynar_push(ps->frames, &frame);
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.
*/
-
gras
_error_t
+
xbt
_error_t
gras_cbps_v_pop (gras_cbps_t ps,
const char *name,
gras_datadesc_type_t *ddt,
void **res) {
gras_cbps_v_pop (gras_cbps_t ps,
const char *name,
gras_datadesc_type_t *ddt,
void **res) {
-
gras
_dynar_t varstack,frame;
+
xbt
_dynar_t varstack,frame;
gras_cbps_elm_t var = NULL;
void *data = NULL;
gras_cbps_elm_t var = NULL;
void *data = NULL;
-
gras
_error_t errcode;
+
xbt
_error_t errcode;
DEBUG1("pop(%s)",name);
/* FIXME: Error handling */
DEBUG1("pop(%s)",name);
/* FIXME: Error handling */
- errcode =
gras
_dict_get(ps->space, name, (void **)&varstack);
+ errcode =
xbt
_dict_get(ps->space, name, (void **)&varstack);
if (errcode == mismatch_error) {
RAISE1(mismatch_error,"Asked to pop the non-existant %s",
name);
}
if (errcode == mismatch_error) {
RAISE1(mismatch_error,"Asked to pop the non-existant %s",
name);
}
-
gras
_dynar_pop(varstack, &var);
+
xbt
_dynar_pop(varstack, &var);
- if (!
gras
_dynar_length(varstack)) {
+ if (!
xbt
_dynar_length(varstack)) {
DEBUG1("Last incarnation of %s poped. Kill it",name);
DEBUG1("Last incarnation of %s poped. Kill it",name);
-
gras
_dict_remove(ps->space, name);
-
gras
_dynar_free(&varstack);
+
xbt
_dict_remove(ps->space, name);
+
xbt
_dynar_free(&varstack);
}
if (ddt)
*ddt = var->type;
data = var->data;
}
if (ddt)
*ddt = var->type;
data = var->data;
-
gras_
free(var);
+ free(var);
-
gras
_dynar_pop(ps->frames, &frame);
+
xbt
_dynar_pop(ps->frames, &frame);
{
{
- int l =
gras
_dynar_length(frame);
+ int l =
xbt
_dynar_length(frame);
while (l--) {
char *_name = NULL;
while (l--) {
char *_name = NULL;
- _name =
gras
_dynar_get_as(frame, l, char*);
+ _name =
xbt
_dynar_get_as(frame, l, char*);
if (!strcmp(name, _name)) {
if (!strcmp(name, _name)) {
-
gras
_dynar_remove_at(frame, l, &_name);
-
gras_
free(_name);
+
xbt
_dynar_remove_at(frame, l, &_name);
+ free(_name);
break;
}
}
}
break;
}
}
}
-
gras
_dynar_push(ps->frames, &frame);
+
xbt
_dynar_push(ps->frames, &frame);
*res = data;
return no_error;
}
*res = data;
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?).
@@
-180,34
+176,32
@@
gras_cbps_v_set (gras_cbps_t ps,
void *data,
gras_datadesc_type_t ddt) {
void *data,
gras_datadesc_type_t ddt) {
-
gras
_dynar_t dynar = NULL;
+
xbt
_dynar_t dynar = NULL;
gras_cbps_elm_t elm = NULL;
gras_cbps_elm_t elm = NULL;
-
gras
_error_t errcode;
+
xbt
_error_t errcode;
DEBUG1("set(%s)",name);
DEBUG1("set(%s)",name);
- errcode =
gras
_dict_get(ps->space, name, (void **)&dynar);
+ errcode =
xbt
_dict_get(ps->space, name, (void **)&dynar);
if (errcode == mismatch_error) {
if (errcode == mismatch_error) {
- dynar =
gras
_dynar_new(sizeof (gras_cbps_elm_t), NULL);
-
gras
_dict_set(ps->space, name, (void **)dynar, NULL);
+ dynar =
xbt
_dynar_new(sizeof (gras_cbps_elm_t), NULL);
+
xbt
_dict_set(ps->space, name, (void **)dynar, NULL);
- elm =
gras
_new0(s_gras_cbps_elm_t,1);
-
gras
_dynar_push(ps->globals, &name);
+ elm =
xbt
_new0(s_gras_cbps_elm_t,1);
+
xbt
_dynar_push(ps->globals, &name);
} else {
} else {
-
gras
_dynar_pop(dynar, &elm);
+
xbt
_dynar_pop(dynar, &elm);
}
elm->type = ddt;
elm->data = data;
}
elm->type = ddt;
elm->data = data;
-
gras
_dynar_push(dynar, &elm);
+
xbt
_dynar_push(dynar, &elm);
}
}
-/**
- * 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
@@
-218,14
+212,14
@@
gras_cbps_v_get (gras_cbps_t ps,
const char *name,
/* OUT */gras_datadesc_type_t *ddt) {
const char *name,
/* OUT */gras_datadesc_type_t *ddt) {
-
gras
_dynar_t dynar = NULL;
+
xbt
_dynar_t dynar = NULL;
gras_cbps_elm_t elm = NULL;
DEBUG1("get(%s)",name);
/* FIXME: Error handling */
gras_cbps_elm_t elm = NULL;
DEBUG1("get(%s)",name);
/* FIXME: Error handling */
-
gras
_dict_get(ps->space, name, (void **)&dynar);
-
gras
_dynar_pop(dynar, &elm);
-
gras
_dynar_push(dynar, &elm);
+
xbt
_dict_get(ps->space, name, (void **)&dynar);
+
xbt
_dynar_pop(dynar, &elm);
+
xbt
_dynar_push(dynar, &elm);
if (ddt) {
*ddt = elm->type;
if (ddt) {
*ddt = elm->type;
@@
-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
*
@@
-252,122
+243,94
@@
gras_cbps_v_get (gras_cbps_t ps,
void
gras_cbps_block_begin(gras_cbps_t ps) {
void
gras_cbps_block_begin(gras_cbps_t ps) {
-
gras
_dynar_t dynar = NULL;
+
xbt
_dynar_t dynar = NULL;
DEBUG0(">>> Block begin");
DEBUG0(">>> Block begin");
- dynar =
gras
_dynar_new(sizeof (char *), NULL);
-
gras
_dynar_push(ps->frames, &dynar);
+ dynar =
xbt
_dynar_new(sizeof (char *), NULL);
+
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) {
-
gras
_dynar_t frame = NULL;
+
xbt
_dynar_t frame = NULL;
int cursor = 0;
char *name = NULL;
int cursor = 0;
char *name = NULL;
-
gras_assert0(gras
_dynar_length(ps->frames),
+
xbt_assert0(xbt
_dynar_length(ps->frames),
"More block_end than block_begin");
"More block_end than block_begin");
-
gras
_dynar_pop(ps->frames, &frame);
+
xbt
_dynar_pop(ps->frames, &frame);
-
gras
_dynar_foreach(frame, cursor, name) {
+
xbt
_dynar_foreach(frame, cursor, name) {
-
gras
_dynar_t varstack = NULL;
+
xbt
_dynar_t varstack = NULL;
gras_cbps_elm_t var = NULL;
DEBUG2("Get ride of %s (%p)",name,(void*)name);
gras_cbps_elm_t var = NULL;
DEBUG2("Get ride of %s (%p)",name,(void*)name);
-
gras
_dict_get(ps->space, name, (void **)&varstack);
-
gras
_dynar_pop(varstack, &var);
+
xbt
_dict_get(ps->space, name, (void **)&varstack);
+
xbt
_dynar_pop(varstack, &var);
- if (!
gras
_dynar_length(varstack)) {
-
gras
_dict_remove(ps->space, name);
-
gras
_dynar_free_container(&varstack); /*already empty, save a test ;) */
+ if (!
xbt
_dynar_length(varstack)) {
+
xbt
_dict_remove(ps->space, name);
+
xbt
_dynar_free_container(&varstack); /*already empty, save a test ;) */
}
}
- if (var->data)
gras_
free(var->data);
-
gras_
free(var);
-
gras_
free(name);
+ if (var->data) free(var->data);
+ free(var);
+ free(name);
}
}
-
gras
_dynar_free_container(&frame);/* we just emptied it */
+
xbt
_dynar_free_container(&frame);/* we just emptied it */
DEBUG0("<<< Block end");
}
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) {
- gras_error_t errcode;
DEBUG1("push %d as a size",val);
DEBUG1("push %d as a size",val);
-
gras
_dynar_push_as(ps->lints,int,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;
-
gras_assert0(gras
_dynar_length(ps->lints) > 0,
+
xbt_assert0(xbt
_dynar_length(ps->lints) > 0,
"gras_cbps_i_pop: no value to pop");
"gras_cbps_i_pop: no value to pop");
- ret =
gras
_dynar_pop_as(ps->lints,int);
+ ret =
xbt
_dynar_pop_as(ps->lints,int);
DEBUG1("pop %d as a size",ret);
return ret;
}
DEBUG1("pop %d as a size",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) {
return gras_cbps_i_pop(vars);
}
*/
int gras_datadesc_cb_pop(gras_cbps_t vars, void *data) {
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
- */
+/** \brief 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) {
int *i = (int*)data;
gras_cbps_i_push(vars, (int) *i);
}
void gras_datadesc_cb_push_int(gras_cbps_t vars, void *data) {
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
- */
+/** \brief 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) {
unsigned int *i = (unsigned int*)data;
gras_cbps_i_push(vars, (int) *i);
}
void gras_datadesc_cb_push_uint(gras_cbps_t vars, void *data) {
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) {
long int *i = (long int*)data;
gras_cbps_i_push(vars, (int) *i);
}
*/
void gras_datadesc_cb_push_lint(gras_cbps_t vars, void *data) {
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) {
unsigned long int *i = (unsigned long int*)data;
*/
void gras_datadesc_cb_push_ulint(gras_cbps_t vars, void *data) {
unsigned long int *i = (unsigned long int*)data;