/* 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
- 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");
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) {
xbt_dynar_free( &( (*state)->frames ) );
xbt_dynar_free( &( (*state)->globals ) );
- xbt_free(*state);
+ free(*state);
*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.
*/
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.
*/
*ddt = var->type;
data = var->data;
- xbt_free(var);
+ free(var);
xbt_dynar_pop(ps->frames, &frame);
{
_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;
}
}
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?).
}
-/**
- * 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
}
-/**
- * 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
*
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) {
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");
}
-/**
- * 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) {
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;
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);
}
-/**
- * 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);
}
-/**
- * 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);
}
-/**
- * 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);
}
-/**
- * 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);
}
