From 27e45c4d7ab7139603ac3f62de10f44d1bb071a0 Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 27 Sep 2004 14:18:58 +0000 Subject: [PATCH] port the SG part to the new stuff intended to work on AIX git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@429 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/ping/Makefile.am | 2 +- src/gras/Transport/sg_transport.c | 6 +++--- src/gras/Transport/transport_plugin_sg.c | 20 ++++++++++---------- src/gras/Virtu/sg_conditional.c | 4 ++-- src/gras/Virtu/sg_process.c | 7 ++++--- src/gras/Virtu/sg_time.c | 2 +- src/gras/Virtu/virtu_sg.h | 2 +- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/examples/ping/Makefile.am b/examples/ping/Makefile.am index 4e9edc5430..78575390bf 100644 --- a/examples/ping/Makefile.am +++ b/examples/ping/Makefile.am @@ -10,7 +10,7 @@ if HAVE_SG check_PROGRAMS=ping_simulator ping_client ping_server ping_simulator_SOURCES=_ping_simulator.c ping.c - ping_simulator_LDADD= $(top_builddir)/libgrassg.la @LIBS_SimGrid@ + ping_simulator_LDADD= $(top_builddir)/src/libgrassg.la @LIBS_SimGrid@ else check_PROGRAMS=ping_client ping_server endif diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c index 5dbe4ecd5d..38acc704ab 100644 --- a/src/gras/Transport/sg_transport.c +++ b/src/gras/Transport/sg_transport.c @@ -8,9 +8,9 @@ /* 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 "Transport/transport_private.h" +#include "gras/Transport/transport_private.h" #include -#include "Virtu/virtu_sg.h" +#include "gras/Virtu/virtu_sg.h" GRAS_LOG_EXTERNAL_CATEGORY(transport); GRAS_LOG_DEFAULT_CATEGORY(transport); @@ -80,7 +80,7 @@ gras_trp_select(double timeout, (*dst)->port = -1; - if (!(sockdata = malloc(sizeof(gras_trp_sg_sock_data_t)))) + if (!(sockdata = gras_new(gras_trp_sg_sock_data_t,1))) RAISE_MALLOC; sockdata->from_PID = MSG_process_self_PID(); diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c index f86e756eed..c0df9da63b 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -16,7 +16,7 @@ #include "gras_private.h" #include "transport_private.h" -#include "Virtu/virtu_sg.h" +#include "gras/Virtu/virtu_sg.h" GRAS_LOG_EXTERNAL_CATEGORY(transport); GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_sg,transport,"SimGrid pseudo-transport"); @@ -77,7 +77,7 @@ static gras_error_t find_port(gras_hostdata_t *hd, int port, gras_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) { - gras_trp_sg_plug_data_t *data=malloc(sizeof(gras_trp_sg_plug_data_t)); + gras_trp_sg_plug_data_t *data=gras_new(gras_trp_sg_plug_data_t,1); if (!data) RAISE_MALLOC; @@ -140,7 +140,7 @@ gras_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self, } /* create the socket */ - if (!(data = malloc(sizeof(gras_trp_sg_sock_data_t)))) + if (!(data = gras_new(gras_trp_sg_sock_data_t,1))) RAISE_MALLOC; data->from_PID = MSG_process_self_PID(); @@ -193,7 +193,7 @@ gras_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self, } /* Create the socket */ - if (!(data = malloc(sizeof(gras_trp_sg_sock_data_t)))) + if (!(data = gras_new(gras_trp_sg_sock_data_t,1))) RAISE_MALLOC; data->from_PID = -1; @@ -220,12 +220,12 @@ void gras_trp_sg_socket_close(gras_socket_t *sock){ gras_assert0(hd,"Please run gras_process_init on each process"); if (sock->data) - free(sock->data); + gras_free(sock->data); if (sock->incoming) { /* server mode socket. Un register it from 'OS' tables */ gras_dynar_foreach(hd->ports, cpt, pr) { - DEBUG2("Check pr %d of %d", cpt, gras_dynar_length(hd->ports)); + DEBUG2("Check pr %d of %lu", cpt, gras_dynar_length(hd->ports)); if (pr.port == sock->port) { gras_dynar_cursor_rm(hd->ports, &cpt); return; @@ -253,9 +253,9 @@ gras_error_t gras_trp_sg_chunk_send(gras_socket_t *sock, sprintf(name,"Chunk[%d]",count++); - if (!(task_data=malloc(sizeof(sg_task_data_t)))) + if (!(task_data=gras_new(sg_task_data_t,1))) RAISE_MALLOC; - if (!(task_data->data=malloc(size))) + if (!(task_data->data=(void*)gras_malloc(size))) RAISE_MALLOC; task_data->size = size; memcpy(task_data->data,data,size); @@ -296,8 +296,8 @@ gras_error_t gras_trp_sg_chunk_recv(gras_socket_t *sock, MSG_host_get_name(sock_data->to_host), MSG_host_get_name(MSG_host_self()), sock_data->to_chan); memcpy(data,task_data->data,size); - free(task_data->data); - free(task_data); + gras_free(task_data->data); + gras_free(task_data); if (MSG_task_destroy(task) != MSG_OK) RAISE0(unknown_error,"Error in MSG_task_destroy()"); diff --git a/src/gras/Virtu/sg_conditional.c b/src/gras/Virtu/sg_conditional.c index 7ae9d76f8d..1c0737e0c3 100644 --- a/src/gras/Virtu/sg_conditional.c +++ b/src/gras/Virtu/sg_conditional.c @@ -1,6 +1,6 @@ /* $Id$ */ -/* rl_conditional - conditional execution (simulation) */ +/* sg_conditional - conditional execution (simulation) */ /* Authors: Martin Quinson */ /* Copyright (C) 2003,2004 da GRAS posse. */ @@ -8,7 +8,7 @@ /* 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 "Virtu/virtu_rl.h" +#include "gras/Virtu/virtu_sg.h" int gras_if_RL(void) { return 0; diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c index 869111f62d..9fb983d1dd 100644 --- a/src/gras/Virtu/sg_process.c +++ b/src/gras/Virtu/sg_process.c @@ -8,9 +8,10 @@ /* 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 "Virtu/virtu_sg.h" +#include "gras/Virtu/virtu_sg.h" GRAS_LOG_EXTERNAL_CATEGORY(process); +GRAS_LOG_DEFAULT_CATEGORY(process); gras_error_t gras_process_init() { @@ -20,7 +21,7 @@ gras_process_init() { gras_sg_portrec_t prraw,pr; int i; - if (!(pd=(gras_procdata_t *)malloc(sizeof(gras_procdata_t)))) + if (!(pd=gras_new(gras_procdata_t,1))) RAISE_MALLOC; if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK) { @@ -29,7 +30,7 @@ gras_process_init() { TRY(gras_procdata_init()); if (!hd) { - if (!(hd=(gras_hostdata_t *)malloc(sizeof(gras_hostdata_t)))) + if (!(hd=gras_new(gras_hostdata_t,1))) RAISE_MALLOC; TRY(gras_dynar_new(&(hd->ports),sizeof(gras_sg_portrec_t),NULL)); diff --git a/src/gras/Virtu/sg_time.c b/src/gras/Virtu/sg_time.c index f71c8b3e47..7dec70e5e3 100644 --- a/src/gras/Virtu/sg_time.c +++ b/src/gras/Virtu/sg_time.c @@ -8,7 +8,7 @@ /* 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 "Virtu/virtu_sg.h" +#include "gras/Virtu/virtu_sg.h" /** * gras_time: diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h index dbedd92c8b..9d0a89c087 100644 --- a/src/gras/Virtu/virtu_sg.h +++ b/src/gras/Virtu/virtu_sg.h @@ -12,7 +12,7 @@ #define VIRTU_SG_H #include "gras_private.h" -#include "Virtu/virtu_interface.h" +#include "gras/Virtu/virtu_interface.h" #include /* SimGrid header */ #define GRAS_MAX_CHANNEL 10 -- 2.20.1