Finalize reservation surf plugin

[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 6066116..a7e7024 100644 (file)
--- a/src/bindings/java/surf_swig.hpp
+++ b/src/bindings/java/surf_swig.hpp
@@ -4,29 +4,31 @@
 #include "src/surf/network_interface.hpp"
 #include "src/surf/maxmin_private.hpp"
 
+typedef xbt_dynar_t NetworkLinkDynar;
+
 double getClock();
 
+void clean();
+
+NetworkLinkDynar getRoute(char *srcName, char *dstName);
+
 class Plugin {
 public:
- virtual ~Plugin() { 
+ virtual ~Plugin() {
    std::cout << "Plugin::~Plugin()" << std:: endl;
  }
 
- void exit() {
-   surf_exit();
- }
-
- void activateCpuCreatedCallback(); 
+ void activateCpuCreatedCallback();
  virtual void cpuCreatedCallback(Cpu *cpu) {}
 
  void activateCpuDestructedCallback();
  virtual void cpuDestructedCallback(Cpu *cpu) {}
- 
+
  void activateCpuStateChangedCallback();
- virtual void cpuStateChangedCallback(Cpu *cpu) {}
+ virtual void cpuStateChangedCallback(Cpu *cpu, e_surf_resource_state_t, e_surf_resource_state_t) {}
 
  void activateCpuActionStateChangedCallback();
- virtual void cpuActionStateChangedCallback(CpuAction *action) {}
+ virtual void cpuActionStateChangedCallback(CpuAction *action, e_surf_action_state_t, e_surf_action_state_t) {}
 
 
  void activateNetworkLinkCreatedCallback();
@@ -36,11 +38,11 @@ public:
  virtual void networkLinkDestructedCallback(NetworkLink *link) {}
 
  void activateNetworkLinkStateChangedCallback();
- virtual void networkLinkStateChangedCallback(NetworkLink *link) {}
+ virtual void networkLinkStateChangedCallback(NetworkLink *link, e_surf_resource_state_t, e_surf_resource_state_t) {}
 
  void activateNetworkActionStateChangedCallback();
- virtual void networkActionStateChangedCallback(NetworkAction *action) {}
+ virtual void networkActionStateChangedCallback(NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t cur) {}
 
+ void activateNetworkCommunicateCallback();
+ virtual void networkCommunicateCallback(NetworkAction *action, RoutingEdge *src, RoutingEdge *dst, double size, double rate) {}
 };
-
-