From 629cb03f62f68abeaf28abc7080c0393e685b337 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Sat, 14 May 2016 02:02:11 +0200 Subject: [PATCH] cosmetics --- doc/Layout.xml | 2 +- src/bindings/java/org/simgrid/msg/Host.java | 13 ++----------- tools/cmake/DefinePackages.cmake | 14 ++++---------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/doc/Layout.xml b/doc/Layout.xml index eb71a76ae1..e7c5733e60 100644 --- a/doc/Layout.xml +++ b/doc/Layout.xml @@ -1,7 +1,7 @@ - + diff --git a/src/bindings/java/org/simgrid/msg/Host.java b/src/bindings/java/org/simgrid/msg/Host.java index c15b2afa30..3dc1e5ecea 100644 --- a/src/bindings/java/org/simgrid/msg/Host.java +++ b/src/bindings/java/org/simgrid/msg/Host.java @@ -61,7 +61,6 @@ public class Host { @Override public String toString (){ return this.name; - } /** @@ -74,8 +73,7 @@ public class Host { * @exception HostNotFoundException if the name of the host is not valid. * NativeException if the native version of this method failed. */ - public native static Host getByName(String name) - throws HostNotFoundException, NullPointerException; + public native static Host getByName(String name) throws HostNotFoundException, NullPointerException; /** Counts the installed hosts. */ public native static int getCount(); @@ -98,17 +96,14 @@ public class Host { */ public static native void setAsyncMailbox(String mailboxName); - - /** Returns the name of an host. */ public String getName() { return name; } - /** Sets the user data of the host. */ public void setData(Object data) { this.data = data; } - /** Gets the user data of the host. */ + public Object getData() { return this.data; } @@ -122,18 +117,14 @@ public class Host { /** Stops the host if it is on */ public native void off(); - /** * This method returns the speed of the processor of a host (in flops), * regardless of the current load of the machine. */ public native double getSpeed(); - /** Returns the number of core of a host. */ public native double getCoreNumber(); - /** Returns the value of a given host property. */ public native String getProperty(String name); - /** Changes the value of a given host property. */ public native void setProperty(String name, String value); /** Tests if an host is up and running. */ public native boolean isOn(); diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 61bd33b91e..f17836c3b5 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -696,17 +696,11 @@ set(source_of_generated_headers ### depend of some variables setted upper # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS if(${HAVE_THREAD_CONTEXTS}) #pthread - set(SURF_SRC - ${SURF_SRC} - src/simix/ContextThread.cpp - src/simix/ContextThread.hpp - ) + set(SURF_SRC ${SURF_SRC} src/simix/ContextThread.cpp + src/simix/ContextThread.hpp ) else() # NOT pthread - set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/ContextThread.cpp - src/simix/ContextThread.hpp - ) + set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp + src/simix/ContextThread.hpp ) endif() if(${HAVE_THREAD_CONTEXTS}) #pthread -- 2.20.1