%}
%pragma(java) jniclasscode=%{
static {
- NativeLib.nativeInit("simgrid");
- NativeLib.nativeInit("surf-java");
+ org.simgrid.NativeLib.nativeInit();
Runtime.getRuntime().addShutdownHook(
new Thread() {
public void run() {
#endif
JNIEXPORT jobject JNICALL Java_org_simgrid_surf_SurfJNI_getAction(JNIEnv *env, jclass cls, jlong jarg1) {
- Action * action = (Action *)jarg1;
+ simgrid::surf::Action * action = (simgrid::surf::Action *)jarg1;
jobject res;
- CpuAction *cpu_action = dynamic_cast<CpuAction*>(action);
+ simgrid::surf::CpuAction *cpu_action =
+ dynamic_cast<simgrid::surf::CpuAction*>(action);
if (cpu_action) {
- SwigDirector_CpuAction *dir_cpu_action = dynamic_cast<SwigDirector_CpuAction*>(cpu_action);
+ SwigDirector_CpuAction *dir_cpu_action =
+ dynamic_cast<SwigDirector_CpuAction*>(cpu_action);
if (dir_cpu_action) {
res = dir_cpu_action->swig_get_self(env);\
} else {
#define GETDIRECTOR(NAME) \
JNIEXPORT jobject JNICALL Java_org_simgrid_surf_SurfJNI_get## NAME ## Director(JNIEnv *env, jclass cls, jlong jarg1)\
{\
- NAME * arg1 = (NAME*)jarg1;\
+ simgrid::surf::NAME * arg1 = (simgrid::surf::NAME*)jarg1;\
SwigDirector_ ##NAME *director = dynamic_cast<SwigDirector_ ##NAME *>(arg1);\
jobject res;\
if (director) {\
}
%typemap(out) ActionArrayPtr {
long l = 0;
- for(ActionList::iterator it($1->begin()), itend($1->end()); it != itend ; ++it) {
+ for(simgrid::surf::ActionList::iterator it($1->begin()), itend($1->end()); it != itend ; ++it) {
l++;
}
$result = jenv->NewLongArray(l);
jlong *elts = jenv->GetLongArrayElements($result, NULL);
l = 0;
- for(ActionList::iterator it($1->begin()), itend($1->end()); it != itend ; ++it) {
- elts[l++] = (jlong)static_cast<Action*>(&*it);
+ for(simgrid::surf::ActionList::iterator it($1->begin()), itend($1->end()); it != itend ; ++it) {
+ elts[l++] = (jlong)static_cast<simgrid::surf::Action*>(&*it);
}
jenv->ReleaseLongArrayElements($result, elts, 0);
}
+namespace simgrid {
+namespace surf {
+
class ActionList {
public:
//void push_front(Action &action);
}
};
+}
+}
+
/* Handle xbt_dynar_t of Link */
-JAVA_ARRAYSOFCLASSES(Link);
-%apply Link[] {LinkDynar};
+JAVA_ARRAYSOFCLASSES(simgrid::surf::Link);
+%apply simgrid::surf::Link[] {LinkDynar};
%typemap(jstype) LinkDynar "Link[]"
%typemap(javain) LinkDynar "Link.cArrayUnwrap($javainput)"
%typemap(javaout) LinkDynar {
%typemap(out) DoubleDynar {
long l = xbt_dynar_length($1);
$result = jenv->NewDoubleArray(l);
- double *lout = (double *)xbt_dynar_to_array($1);
+ double *lout = (double *) xbt_dynar_get_ptr($1, 0);
jenv->SetDoubleArrayRegion($result, 0, l, (jdouble*)lout);
- free(:);
}
%typemap(javadirectorin) DoubleDynar "$jniinput"
%typemap(directorin,descriptor="[D") DoubleDynar %{
long l = xbt_dynar_length($1);
$input = jenv->NewDoubleArray(l);
- double *lout = (double *)xbt_dynar_to_array($1);
+ double *lout = (double *) xbt_dynar_get_ptr($1, 0);
jenv->SetDoubleArrayRegion($input, 0, l, (jdouble*)lout);
- free(lout);
%}
%typemap(javain) DoubleDynar "$javainput"
%typemap(javaout) DoubleDynar {return $jnicall}
%include "src/bindings/java/surf_swig.hpp"
+namespace simgrid {
+namespace surf {
+
+class Model;
+class CpuModel;
+class HostModel;
+class VMModel;
+class NetworkModel;
+class StorageModel;
+class Resource;
+class ResourceLmm;
+class Host;
+class HostCLM03;
+class NetworkCm02Link;
+class Action;
+class ActionLmm;
+class StorageActionLmm;
+class As;
+class RoutingPlatf;
+
+}
+}
+
%rename tmgr_trace TmgrTrace;
%nodefaultctor tmgr_trace;
struct tmgr_trace {
}
};
+namespace simgrid {
+namespace surf {
+
%nodefaultctor Model;
class Model {
public:
virtual void updateActionsStateLazy(double now, double delta);
virtual void updateActionsStateFull(double now, double delta);
- virtual ActionList *getRunningActionSet();
+ virtual simgrid::surf::ActionList *getRunningActionSet();
virtual void addTraces()=0;
};
public:
CpuModel();
virtual ~CpuModel();
- virtual Cpu *createCpu(const char *name, DoubleDynar power_peak,
+ virtual simgrid::surf::Cpu *createCpu(const char *name,
+ DoubleDynar power_peak,
int pstate, double power_scale,
tmgr_trace *power_trace, int core,
e_surf_resource_state_t state_initial,
- tmgr_trace *state_trace,
- s_xbt_dict *cpu_properties)=0;
+ tmgr_trace *state_trace)=0;
};
class Resource {
Resource();
const char *getName();
virtual bool isUsed()=0;
- Model *getModel();
+ simgrid::surf::Model *getModel();
virtual e_surf_resource_state_t getState();
lmm_constraint *getConstraint();
- s_xbt_dict *getProperties();
virtual void updateState(tmgr_trace_event *event_type, double value, double date)=0;
};
%feature("director") Cpu;
class Cpu : public Resource {
public:
- Cpu(Model *model, const char *name, s_xbt_dict *props,
+ Cpu(simgrid::surf::Model *model, const char *name,
lmm_constraint *constraint, int core, double powerPeak, double powerScale);
- Cpu(Model *model, const char *name, s_xbt_dict *props,
+ Cpu(simgrid::surf::Model *model, const char *name,
int core, double powerPeak, double powerScale);
virtual ~Cpu();
virtual double getCurrentPowerPeak();
- virtual CpuAction *execute(double size)=0;
- virtual CpuAction *sleep(double duration)=0;
+ virtual simgrid::surf::CpuAction *execute(double size)=0;
+ virtual simgrid::surf::CpuAction *sleep(double duration)=0;
virtual int getCore();
virtual double getSpeed(double load);
virtual double getAvailableSpeed();
void setState(e_surf_resource_state_t state);
};
-class Link : public Resource {
+class Link : public simgrid::surf::Resource {
public:
Link();
~Link();
void updateBandwidth(double value, double date=surf_get_clock());
double getLatency();
void updateLatency(double value, double date=surf_get_clock());
+ s_xbt_dict *getProperties();
};
%nodefaultctor Action;
public:
CpuAction(Model *model, double cost, bool failed);
%extend {
- Cpu *getCpu() {return getActionCpu($self);}
+ simgrid::surf::Cpu *getCpu() {return getActionCpu($self);}
}
};
virtual char *getName()=0;
};
+}
+}
+
%rename lmm_constraint LmmConstraint;
struct lmm_constraint {
%extend {
