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
rename host callbacks
[simgrid.git]
/
src
/
bindings
/
java
/
surf_swig.hpp
diff --git
a/src/bindings/java/surf_swig.hpp
b/src/bindings/java/surf_swig.hpp
index
1c51c7b
..
39f533e
100644
(file)
--- a/
src/bindings/java/surf_swig.hpp
+++ b/
src/bindings/java/surf_swig.hpp
@@
-1,16
+1,28
@@
+/* Copyright (c) 2014-2015. 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. */
+
#include <cstdio>
#include <iostream>
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/maxmin_private.hpp"
#include <cstdio>
#include <iostream>
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/maxmin_private.hpp"
-typedef xbt_dynar_t NetworkLinkDynar;
+typedef xbt_dynar_t LinkDynar;
+typedef simgrid::surf::ActionList *ActionArrayPtr;
double getClock();
void clean();
double getClock();
void clean();
-NetworkLinkDynar getRoute(char *srcName, char *dstName);
+simgrid::surf::CpuModel *getCpuModel();
+void setCpuModel(simgrid::surf::CpuModel *cpuModel);
+
+void setCpu(char *name, simgrid::surf::Cpu *cpu);
+
+LinkDynar getRoute(char *srcName, char *dstName);
class Plugin {
public:
class Plugin {
public:
@@
-19,30
+31,30
@@
public:
}
void activateCpuCreatedCallback();
}
void activateCpuCreatedCallback();
- virtual void cpuCreatedCallback(Cpu *cpu) {}
+ virtual void cpuCreatedCallback(
simgrid::surf::
Cpu *cpu) {}
void activateCpuDestructedCallback();
void activateCpuDestructedCallback();
- virtual void cpuDestructedCallback(Cpu *cpu) {}
+ virtual void cpuDestructedCallback(
simgrid::surf::
Cpu *cpu) {}
void activateCpuStateChangedCallback();
void activateCpuStateChangedCallback();
- virtual void cpuStateChangedCallback(
Cpu *cpu
) {}
+ virtual void cpuStateChangedCallback(
simgrid::surf::Cpu *cpu, e_surf_resource_state_t, e_surf_resource_state_t
) {}
void activateCpuActionStateChangedCallback();
void activateCpuActionStateChangedCallback();
- virtual void cpuActionStateChangedCallback(
CpuAction *action
) {}
+ virtual void cpuActionStateChangedCallback(
simgrid::surf::CpuAction *action, e_surf_action_state_t, e_surf_action_state_t
) {}
- void activate
Network
LinkCreatedCallback();
- virtual void networkLinkCreatedCallback(
Network
Link *link) {}
+ void activateLinkCreatedCallback();
+ virtual void networkLinkCreatedCallback(
simgrid::surf::
Link *link) {}
- void activate
Network
LinkDestructedCallback();
- virtual void networkLinkDestructedCallback(
Network
Link *link) {}
+ void activateLinkDestructedCallback();
+ virtual void networkLinkDestructedCallback(
simgrid::surf::
Link *link) {}
- void activate
Network
LinkStateChangedCallback();
- virtual void networkLinkStateChangedCallback(
NetworkLink *link
) {}
+ void activateLinkStateChangedCallback();
+ virtual void networkLinkStateChangedCallback(
simgrid::surf::Link *link, e_surf_resource_state_t, e_surf_resource_state_t
) {}
void activateNetworkActionStateChangedCallback();
void activateNetworkActionStateChangedCallback();
- virtual void networkActionStateChangedCallback(
NetworkAction *action
) {}
+ virtual void networkActionStateChangedCallback(
simgrid::surf::NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t cur
) {}
+ void activateNetworkCommunicateCallback();
+ virtual void networkCommunicateCallback(simgrid::surf::NetworkAction *action, simgrid::surf::RoutingEdge *src, simgrid::surf::RoutingEdge *dst, double size, double rate) {}
};
};
-
-