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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
amok
/
peermanagement.h
diff --git
a/include/amok/peermanagement.h
b/include/amok/peermanagement.h
index
f92957d
..
1f2fd7a
100644
(file)
--- a/
include/amok/peermanagement.h
+++ b/
include/amok/peermanagement.h
@@
-1,8
+1,7
@@
-/* $Id$ */
-
/* amok peer management - servers main loop and remote peer stopping */
/* amok peer management - servers main loop and remote peer stopping */
-/* Copyright (c) 2006 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * 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. */
/* 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. */
@@
-62,23
+61,23
@@
XBT_PUBLIC(void) amok_pm_exit(void);
XBT_PUBLIC(void) amok_pm_mainloop(double timeOut);
XBT_PUBLIC(void) amok_pm_kill_hp(char *name, int port);
XBT_PUBLIC(void) amok_pm_mainloop(double timeOut);
XBT_PUBLIC(void) amok_pm_kill_hp(char *name, int port);
-XBT_PUBLIC(void) amok_pm_kill(
gras
_socket_t buddy);
-XBT_PUBLIC(void) amok_pm_kill_sync(
gras
_socket_t buddy);
+XBT_PUBLIC(void) amok_pm_kill(
xbt
_socket_t buddy);
+XBT_PUBLIC(void) amok_pm_kill_sync(
xbt
_socket_t buddy);
XBT_PUBLIC(xbt_dynar_t) amok_pm_group_new(const char *group_name);
XBT_PUBLIC(xbt_dynar_t) amok_pm_group_new(const char *group_name);
-XBT_PUBLIC(xbt_dynar_t) amok_pm_group_get(
gras
_socket_t master,
+XBT_PUBLIC(xbt_dynar_t) amok_pm_group_get(
xbt
_socket_t master,
const char *group_name);
const char *group_name);
-XBT_PUBLIC(int) amok_pm_group_join(
gras
_socket_t master,
+XBT_PUBLIC(int) amok_pm_group_join(
xbt
_socket_t master,
const char *group_name);
const char *group_name);
-XBT_PUBLIC(void) amok_pm_group_leave(
gras
_socket_t master,
+XBT_PUBLIC(void) amok_pm_group_leave(
xbt
_socket_t master,
const char *group_name);
XBT_PUBLIC(void) amok_pm_group_shutdown(const char *group_name);
const char *group_name);
XBT_PUBLIC(void) amok_pm_group_shutdown(const char *group_name);
-XBT_PUBLIC(void) amok_pm_group_shutdown_remote(
gras
_socket_t master,
+XBT_PUBLIC(void) amok_pm_group_shutdown_remote(
xbt
_socket_t master,
const char *group_name);
/** @} */
const char *group_name);
/** @} */
-#endif /* AMOK_peer_MANAGEMENT_H */
+#endif
/* AMOK_peer_MANAGEMENT_H */