From ab0ecac88db14e649fbe8cd9cce7ea219d2edaff Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 4 Feb 2004 19:22:26 +0000 Subject: [PATCH] Adapt to lastest changes in dict: Create dicts before use git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@31 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/gs/message.c | 6 ++++++ src/gras/gs/net_driver.c | 7 ++++++- src/gras/gs/type_driver.c | 7 ++++++- src/gras/gs/type_driver_rl.c | 16 ++++++++-------- src/gras/gs/vars.c | 2 +- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/gras/gs/message.c b/src/gras/gs/message.c index 1fb1b00b72..122bb609d4 100644 --- a/src/gras/gs/message.c +++ b/src/gras/gs/message.c @@ -165,6 +165,9 @@ _gs_message_send_type(struct s_gs_type_bag *p_bag, struct s_gs_type_bag_ops *bops = p_bag->bag_ops; struct s_gs_connection_ops *cops = p_cnx->connection_ops; + if (!*p_refs) + gras_dict_new(p_refs); + if (p_type->category_code > 1) fprintf(stderr, "\n"); fprintf(stderr, "sending a %s\n", p_type->name); @@ -622,6 +625,9 @@ _gs_message_receive_type(struct s_gs_type_bag *p_bag, struct s_gs_type *p_local_type = NULL; void *new_data = *p_new_ptr; + if (!*p_refs) + gras_dict_new(p_refs); + p_local_type = bops->get_type_by_name(p_bag, NULL, p_remote_type->name); if (p_local_type->category_code > 1) fprintf(stderr, "\n"); diff --git a/src/gras/gs/net_driver.c b/src/gras/gs/net_driver.c index ba7adad0b1..ee6d5922b6 100644 --- a/src/gras/gs/net_driver.c +++ b/src/gras/gs/net_driver.c @@ -2,12 +2,17 @@ #include "gs/gs_private.h" +//GRAS_LOG_NEW_DEFAULT_CATEGORY(FIXME_net_driver); + static gras_dict_t *p_net_driver_dict = NULL; void gs_net_drivers_init(void) { - gras_dict_insert(p_net_driver_dict, "fd", gs_fd_net_driver(), NULL); + gras_error_t errcode; + + TRYFAIL(gras_dict_new(&p_net_driver_dict)); + TRYFAIL(gras_dict_insert(p_net_driver_dict, "fd", gs_fd_net_driver(), NULL)); } diff --git a/src/gras/gs/type_driver.c b/src/gras/gs/type_driver.c index 4455a78b44..9099ebfbe5 100644 --- a/src/gras/gs/type_driver.c +++ b/src/gras/gs/type_driver.c @@ -5,9 +5,14 @@ static gras_dict_t *p_type_driver_dict = NULL; +//GRAS_LOG_NEW_DEFAULT_CATEGORY(FIXME_type_driver); + void gs_type_drivers_init(void) { - gras_dict_insert(p_type_driver_dict, "rl", gs_rl_type_driver(), NULL); + gras_error_t errcode; + + TRYFAIL(gras_dict_new(&p_type_driver_dict)); + TRYFAIL(gras_dict_insert(p_type_driver_dict, "rl", gs_rl_type_driver(), NULL)); } diff --git a/src/gras/gs/type_driver_rl.c b/src/gras/gs/type_driver_rl.c index 6f4a979ce0..fd7738eac5 100644 --- a/src/gras/gs/type_driver_rl.c +++ b/src/gras/gs/type_driver_rl.c @@ -124,15 +124,15 @@ gs_rl_bag__init(struct s_gs_type_bag *p_bag) { p_rl = calloc(1, sizeof(struct s_gs_rl_type_bag)); - p_rl->incoming_dict = NULL; + gras_dict_new(&p_rl->incoming_dict); gras_dynar_new(&p_rl->type_dynar, sizeof(struct s_gs_type *), NULL); - p_rl->type_dict = NULL; + gras_dict_new (&p_rl->type_dict); gras_dynar_new(&p_rl->message_dynar, sizeof(struct s_gs_type *), NULL); - p_rl->message_dict = NULL; + gras_dict_new (&p_rl->message_dict); - p_rl->outgoing_dict = NULL; + gras_dict_new (&p_rl->outgoing_dict); p_bag->specific = p_rl; p_bag->bag_ops = type_bag_ops; @@ -168,10 +168,10 @@ gs_rl_bag_register_incoming_connection(struct s_gs_type_bag *p_bag, p_in->p_connection = p_cnx; gras_dynar_new(&p_in->type_dynar, sizeof(struct s_gs_type *), NULL); - p_in->type_dict = NULL; + gras_dict_new (&p_in->type_dict); gras_dynar_new(&p_in->message_dynar, sizeof(struct s_gs_type *), NULL); - p_in->message_dict = NULL; + gras_dict_new (&p_in->message_dict); gras_dict_insert_ext(p_rl->incoming_dict, (char *)&p_cnx, @@ -196,8 +196,8 @@ gs_rl_bag_register_outgoing_connection(struct s_gs_type_bag *p_bag, p_out = malloc(sizeof (struct s_gs_rl_outgoing_connection)); p_out->p_connection = p_cnx; - p_out->type_marker_dict = NULL; - p_out->message_marker_dict = NULL; + gras_dict_new(&p_out->type_marker_dict); + gras_dict_new(&p_out->message_marker_dict); gras_dict_insert_ext(p_rl->outgoing_dict, (char *)&p_cnx, sizeof(p_cnx), p_out, NULL); diff --git a/src/gras/gs/vars.c b/src/gras/gs/vars.c index af6d42cb93..7caf8cfed7 100644 --- a/src/gras/gs/vars.c +++ b/src/gras/gs/vars.c @@ -196,7 +196,7 @@ gs_vars_alloc(void) { p_vars = calloc(1, sizeof (struct s_gs_vars)); - p_vars->space = NULL; + gras_dict_new (&p_vars->space); gras_dynar_new(&p_vars->stack, sizeof (gras_dynar_t *), NULL); gs_vars_enter(p_vars); -- 2.20.1