/* 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_private.h"
+#include "xbt/misc.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "xbt/error.h"
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(set,gros,"data container consisting in dict+dynar");
+#include "xbt/set.h"
+
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(set,xbt,"data container consisting in dict+dynar");
/*####[ Type definition ]####################################################*/
-struct gras_set_ {
- gras_dict_t *dict; /* data stored by name */
- gras_dynar_t *dynar; /* data stored by ID */
-};
+typedef struct gras_set_ {
+ gras_dict_t dict; /* data stored by name */
+ gras_dynar_t dynar; /* data stored by ID */
+} s_gras_set_t;
/*####[ Memory ]############################################################*/
/**
*
* Creates a new set.
*/
-gras_error_t gras_set_new (gras_set_t **dst) {
- gras_set_t *res=gras_new(gras_set_t,1);
+gras_set_t gras_set_new (void) {
+ gras_set_t res=gras_new(s_gras_set_t,1);
gras_error_t errcode;
- if (!res)
- RAISE_MALLOC;
-
- TRY(gras_dict_new (&(res->dict)));
- TRY(gras_dynar_new(&(res->dynar), sizeof(void*),NULL));
+ res->dict=gras_dict_new ();
+ res->dynar=gras_dynar_new(sizeof(void*),NULL);
- *dst=res;
- return no_error;
+ return res;
}
/**
*
* Frees a set.
*/
-void gras_set_free(gras_set_t **set) {
+void gras_set_free(gras_set_t *set) {
if (*set) {
gras_dict_free ( &( (*set)->dict ) );
- gras_dynar_free( (*set)->dynar );
+ gras_dynar_free( &( (*set)->dynar ) );
gras_free(*set);
- *set=NULL;
+ *set = NULL;
}
}
* elm->name_len is used as is unless it's <= 0 (in which case it's recomputed);
* elm->ID is attributed automatically.
*/
-gras_error_t gras_set_add (gras_set_t *set,
- gras_set_elm_t *elm,
- void_f_pvoid_t *free_func) {
+void gras_set_add (gras_set_t set,
+ gras_set_elm_t elm,
+ void_f_pvoid_t *free_func) {
- gras_error_t errcode;
- gras_set_elm_t *found_in_dict;
+ gras_error_t errcode;
+ gras_set_elm_t found_in_dict;
if (elm->name_len <= 0) {
elm->name_len = strlen(elm->name);
if (elm == found_in_dict) {
DEBUG2("Ignoring request to insert the same element twice (key %s ; id %d)",
elm->name, elm->ID);
- return no_error;
+ return;
} else {
elm->ID=found_in_dict->ID;
DEBUG2("Reinsertion of key %s (id %d)", elm->name, elm->ID);
- TRY(gras_dict_set_ext(set->dict, elm->name, elm->name_len, elm, free_func));
- TRY(gras_dynar_set(set->dynar, elm->ID, &elm));
- return no_error;
+ gras_dict_set_ext(set->dict, elm->name, elm->name_len, elm, free_func);
+ gras_dynar_set(set->dynar, elm->ID, &elm);
+ return;
}
- } else if (errcode != mismatch_error) {
- return errcode; /* I expected mismatch_error */
+ } else {
+ gras_assert_error(mismatch_error);
}
elm->ID = gras_dynar_length( set->dynar );
- TRY(gras_dict_set_ext(set->dict, elm->name, elm->name_len, elm, free_func));
- TRY(gras_dynar_set(set->dynar, elm->ID, &elm));
+ gras_dict_set_ext(set->dict, elm->name, elm->name_len, elm, free_func);
+ gras_dynar_set(set->dynar, elm->ID, &elm);
DEBUG2("Insertion of key '%s' (id %d)", elm->name, elm->ID);
- return no_error;
}
/**
*
* get a data stored in the cell by providing its name.
*/
-gras_error_t gras_set_get_by_name (gras_set_t *set,
+gras_error_t gras_set_get_by_name (gras_set_t set,
const char *name,
- /* OUT */gras_set_elm_t **dst) {
+ /* OUT */gras_set_elm_t *dst) {
gras_error_t errcode;
errcode = gras_dict_get_ext(set->dict, name, strlen(name), (void**) dst);
DEBUG2("Lookup key %s: %s",name,gras_error_name(errcode));
* of the name, when strlen cannot be trusted because you don't use a char*
* as name, you weird guy).
*/
-gras_error_t gras_set_get_by_name_ext(gras_set_t *set,
+gras_error_t gras_set_get_by_name_ext(gras_set_t set,
const char *name,
int name_len,
- /* OUT */gras_set_elm_t **dst) {
+ /* OUT */gras_set_elm_t *dst) {
return gras_dict_get_ext (set->dict, name, name_len, (void**)dst);
}
* get a data stored in the cell by providing its id.
* @warning, if the ID does not exists, you're getting into trouble
*/
-gras_error_t gras_set_get_by_id (gras_set_t *set,
+gras_error_t gras_set_get_by_id (gras_set_t set,
int id,
- /* OUT */gras_set_elm_t **dst) {
+ /* OUT */gras_set_elm_t *dst) {
/* Don't bother checking the bounds, the dynar does so */
- gras_dynar_get(set->dynar,id,dst);
- DEBUG3("Lookup type of id %d (of %d): %s",
+ *dst = gras_dynar_get_as(set->dynar,id,gras_set_elm_t);
+ DEBUG3("Lookup type of id %d (of %lu): %s",
id, gras_dynar_length(set->dynar), (*dst)->name);
return no_error;
/***
*** Cursors
***/
-struct gras_set_cursor_ {
- gras_set_t *set;
+typedef struct gras_set_cursor_ {
+ gras_set_t set;
int val;
-};
+} s_gras_set_cursor_t;
/**
* gras_set_cursor_first:
*
* Create the cursor if it does not exists. Rewind it in any case.
*/
-void gras_set_cursor_first (gras_set_t *set,
- gras_set_cursor_t **cursor) {
+void gras_set_cursor_first (gras_set_t set,
+ gras_set_cursor_t *cursor) {
if (set != NULL) {
if (!*cursor) {
DEBUG0("Create the cursor on first use");
- *cursor = gras_new(gras_set_cursor_t,1);
+ *cursor = gras_new(s_gras_set_cursor_t,1);
gras_assert0(*cursor,
"Malloc error during the creation of the cursor");
}
*
* Move to the next element.
*/
-void gras_set_cursor_step (gras_set_cursor_t *cursor) {
+void gras_set_cursor_step (gras_set_cursor_t cursor) {
gras_dynar_cursor_step(cursor->set->dynar, &( cursor->val ) );
}
*
* Get current data
*/
-int gras_set_cursor_get_or_free (gras_set_cursor_t **curs,
- gras_set_elm_t **elm) {
- gras_set_cursor_t *cursor;
+int gras_set_cursor_get_or_free (gras_set_cursor_t *curs,
+ gras_set_elm_t *elm) {
+ gras_set_cursor_t cursor;
if (!curs || !(*curs))
return FALSE;
