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
(kinda) working java wrappers by Malek and me
[simgrid.git]
/
src
/
gras
/
gras.c
diff --git
a/src/gras/gras.c
b/src/gras/gras.c
index
28a5ead
..
4ab3eea
100644
(file)
--- a/
src/gras/gras.c
+++ b/
src/gras/gras.c
@@
-9,19
+9,21
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/log.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/log.h"
+#include "xbt/virtu.h" /* set the XBT virtualization to use GRAS */
#include "xbt/module.h" /* xbt_init/exit */
#include "xbt/module.h" /* xbt_init/exit */
+#include "Virtu/virtu_interface.h" /* Module mechanism FIXME: deplace&rename */
#include "gras_modinter.h" /* module init/exit */
#include "gras_modinter.h" /* module init/exit */
+#include "amok/amok_modinter.h" /* module init/exit */
#include "xbt_modinter.h" /* module init/exit */
#include "gras.h"
#include "gras/process.h" /* FIXME: killme and put process_init in modinter */
#include "xbt_modinter.h" /* module init/exit */
#include "gras.h"
#include "gras/process.h" /* FIXME: killme and put process_init in modinter */
-
+
#include "portable.h" /* hexa_*(); signalling stuff */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras,XBT_LOG_ROOT_CAT,"All GRAS categories (cf. section \ref GRAS_API)");
static int gras_running_process = 0;
#include "portable.h" /* hexa_*(); signalling stuff */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras,XBT_LOG_ROOT_CAT,"All GRAS categories (cf. section \ref GRAS_API)");
static int gras_running_process = 0;
-
#if defined(HAVE_SIGNAL) && defined(HAVE_SIGNAL_H)
static void gras_sigusr_handler(int sig) {
INFO0("SIGUSR1 received. Display the backtrace");
#if defined(HAVE_SIGNAL) && defined(HAVE_SIGNAL_H)
static void gras_sigusr_handler(int sig) {
INFO0("SIGUSR1 received. Display the backtrace");
@@
-43,7
+45,8
@@
static void gras_sigint_handler(int sig) {
void gras_init(int *argc,char **argv) {
VERB0("Initialize GRAS");
void gras_init(int *argc,char **argv) {
VERB0("Initialize GRAS");
-
+
+ xbt_getpid = &gras_os_getpid;
/* First initialize the XBT */
xbt_init(argc,argv);
/* First initialize the XBT */
xbt_init(argc,argv);
@@
-69,28
+72,37
@@
void gras_init(int *argc,char **argv) {
gras_trp_init();
gras_datadesc_init();
#if defined(HAVE_SIGNAL) && defined(HAVE_SIGNAL_H)
gras_trp_init();
gras_datadesc_init();
#if defined(HAVE_SIGNAL) && defined(HAVE_SIGNAL_H)
+# ifdef SIGUSR1
signal(SIGUSR1,gras_sigusr_handler);
signal(SIGUSR1,gras_sigusr_handler);
+# endif
signal(SIGINT,gras_sigint_handler);
#endif
}
signal(SIGINT,gras_sigint_handler);
#endif
}
+
+ /* and then init amok */
+ amok_init();
}
void gras_exit(void) {
INFO0("Exiting GRAS");
}
void gras_exit(void) {
INFO0("Exiting GRAS");
+ amok_exit();
+ gras_moddata_leave();
if (--gras_running_process == 0) {
gras_msg_exit();
gras_trp_exit();
gras_datadesc_exit();
gras_emul_exit();
if (--gras_running_process == 0) {
gras_msg_exit();
gras_trp_exit();
gras_datadesc_exit();
gras_emul_exit();
+ gras_moddata_exit();
}
gras_process_exit();
xbt_exit();
}
}
gras_process_exit();
xbt_exit();
}
-const char *hexa_str(unsigned char *data, int size) {
+const char *hexa_str(unsigned char *data, int size
, int downside
) {
static char*buff=NULL;
static int buffsize=0;
static char*buff=NULL;
static int buffsize=0;
- int i,pos=0;
+ int i,pos=0;
+ int begin,increment;
if (buffsize<5*(size+1)) {
if (buff)
if (buffsize<5*(size+1)) {
if (buff)
@@
-98,17
+110,35
@@
const char *hexa_str(unsigned char *data, int size) {
buffsize=5*(size+1);
buff=xbt_malloc(buffsize);
}
buffsize=5*(size+1);
buff=xbt_malloc(buffsize);
}
- for (i=0;i<size;i++) {
+
+
+ if (downside) {
+ begin=size-1;
+ increment=-1;
+ } else {
+ begin=0;
+ increment=1;
+ }
+
+ for (i=begin; 0<=i && i<size ; i+=increment) {
if (data[i]<32 || data[i]>126)
if (data[i]<32 || data[i]>126)
- sprintf(buff+pos,".
(%02x)",data[i]
);
+ sprintf(buff+pos,".
"
);
else
else
- sprintf(buff+pos,"%c(%02x)",data[i],data[i]);
+ sprintf(buff+pos,"%c",data[i]);
+ while (buff[++pos]);
+ }
+ sprintf(buff+pos,"(");
+ while (buff[++pos]);
+ for (i=begin; 0<=i && i<size ; i+=increment) {
+ sprintf(buff+pos,"%02x",data[i]);
while (buff[++pos]);
}
while (buff[++pos]);
}
+ sprintf(buff+pos,")");
+ while (buff[++pos]);
buff[pos]='\0';
return buff;
}
void hexa_print(const char*name, unsigned char *data, int size) {
buff[pos]='\0';
return buff;
}
void hexa_print(const char*name, unsigned char *data, int size) {
- printf("%s: %s\n", name,hexa_str(data,size));
+ printf("%s: %s\n", name,hexa_str(data,size
,0
));
}
}