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 master into mc-process
[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
..
4211ce1
100644
(file)
--- a/
src/bindings/java/surf_swig.hpp
+++ b/
src/bindings/java/surf_swig.hpp
@@
-1,32
+1,46
@@
+/* Copyright (c) 2014. 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 ActionList *ActionArrayPtr;
+
double getClock();
double getClock();
+void clean();
+
+CpuModel *getCpuModel();
+void setCpuModel(CpuModel *cpuModel);
+
+void setCpu(char *name, Cpu *cpu);
+
+NetworkLinkDynar getRoute(char *srcName, char *dstName);
+
class Plugin {
public:
class Plugin {
public:
- virtual ~Plugin() {
+ virtual ~Plugin() {
std::cout << "Plugin::~Plugin()" << std:: endl;
}
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) {}
virtual void cpuCreatedCallback(Cpu *cpu) {}
void activateCpuDestructedCallback();
virtual void cpuDestructedCallback(Cpu *cpu) {}
-
+
void activateCpuStateChangedCallback();
void activateCpuStateChangedCallback();
- virtual void cpuStateChangedCallback(Cpu *cpu) {}
+ virtual void cpuStateChangedCallback(Cpu *cpu
, e_surf_resource_state_t, e_surf_resource_state_t
) {}
void activateCpuActionStateChangedCallback();
void activateCpuActionStateChangedCallback();
- virtual void cpuActionStateChangedCallback(CpuAction *action) {}
+ virtual void cpuActionStateChangedCallback(CpuAction *action
, e_surf_action_state_t, e_surf_action_state_t
) {}
void activateNetworkLinkCreatedCallback();
void activateNetworkLinkCreatedCallback();
@@
-36,11
+50,11
@@
public:
virtual void networkLinkDestructedCallback(NetworkLink *link) {}
void activateNetworkLinkStateChangedCallback();
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();
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) {}
};
};
-
-