include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake)
### Determine the assembly flavor that we need today
+set(HAVE_RAW_CONTEXTS 0)
include(CMakeDetermineSystem)
IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
IF(${ARCH_32_BITS})
message(STATUS "System processor: i686 (${CMAKE_SYSTEM_PROCESSOR}, 32 bits)")
set(PROCESSOR_i686 1)
+ set(PROCESSOR_x86_64 0)
ELSE()
message(STATUS "System processor: x86_64 (${CMAKE_SYSTEM_PROCESSOR}, 64 bits)")
+ set(PROCESSOR_i686 0)
set(PROCESSOR_x86_64 1)
ENDIF()
if (WIN32)
- message(STATUS "Disable fast raw contextes on Windows.")
+ message(STATUS "Disable fast raw contexts on Windows.")
else()
set(HAVE_RAW_CONTEXTS 1)
endif()
-
+ELSE()
+ set(PROCESSOR_i686 0)
+ set(PROCESSOR_x86_64 0)
ENDIF()
include(CheckFunctionExists)
CHECK_LIBRARY_EXISTS(pthread pthread_create "" HAVE_PTHREAD)
CHECK_LIBRARY_EXISTS(pthread sem_init "" HAVE_SEM_INIT_LIB)
CHECK_LIBRARY_EXISTS(pthread sem_open "" HAVE_SEM_OPEN_LIB)
+set(HAVE_PTHREAD_SETAFFINITY 0)
CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np "" HAVE_PTHREAD_SETAFFINITY)
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
CHECK_SYMBOL_EXISTS(vasprintf stdio.h HAVE_VASPRINTF)
-if(MINGW)
+if(MINGW)
# The detection of vasprintf fails on MinGW, assumingly because it's
# defined as an inline function in stdio.h instead of a regular
# function. So force the result to be 1 despite of the test.
set(HAVE_VASPRINTF 1)
endif()
-
#Check if __thread is defined
execute_process(
COMMAND "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_thread_storage.c -o testprog"
message (STATUS "Warning: no support for SMPI automatic privatization on this platform")
SET(HAVE_PRIVATIZATION 0)
endif()
+else()
+ SET(HAVE_SMPI 0)
endif()
#--------------------------------------------------------------------------------------------------
### Generate the required headers and scripts
#############################################
+
+# gcc makes no difference between "#define HAVE_FOOBAR" and "#define HAVE_FOOBAR 0" by default,
+# but this too error prone. If you forget to include the config.h, you get weird segfaults.
+# If you include it everywhere, everything gets recompiled everytime.
+# So we include only where needed, and compile with -Wundef to notice the missing includes.
+# But cmake sometimes defines to the empty definition (#define HAVE_VALGRIND_H).
+# So we have to make sure that everything got a decent value before generating the files.
+foreach(var HAVE_EXECINFO_H HAVE_FUTEX_H HAVE_GETDTABLESIZE HAVE_GETTIMEOFDAY HAVE_MMAP
+ HAVE_NANOSLEEP HAVE_POPEN HAVE_POSIX_GETTIME HAVE_PROCESS_VM_READV HAVE_SIGNAL_H
+ HAVE_SYS_PARAM_H HAVE_SYS_SYSCTL_H HAVE_SYSCONF HAVE_UCONTEXT_H HAVE_UNISTD_H
+ HAVE_VALGRIND_H HAVE_VASPRINTF)
+ if(${var})
+ set(${var} 1)
+ else()
+ set(${var} 0)
+ endif()
+endforeach()
+
# Avoid triggering a (full) rebuild by touching the files if they did not really change
configure_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/src/internal_config.h.in" "${CMAKE_BINARY_DIR}/src/internal_config.h.generated" @ONLY IMMEDIATE)
configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in" "${CMAKE_BINARY_DIR}/include/simgrid_config.h.generated" @ONLY IMMEDIATE)
message("#### Content of src/internal_config.h ####")
message("##########################################")
file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/src/internal_config.h config_output)
-LIST(REMOVE_AT config_output 0 1 2 3 4 5 6 7 8) # Pass the file header
+LIST(REMOVE_AT config_output 0 1 2 3 4 5 6 7 8 9 10) # Pass the file header
foreach(line ${config_output})
message(" ${line}")
endforeach()
set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/nas_common.h
${CMAKE_CURRENT_SOURCE_DIR}/nas_common.c
- ${CMAKE_CURRENT_SOURCE_DIR}/setparams.c
${CMAKE_CURRENT_SOURCE_DIR}/is.c
${CMAKE_CURRENT_SOURCE_DIR}/dt.c
${CMAKE_CURRENT_SOURCE_DIR}/ep.c
- ${CMAKE_CURRENT_SOURCE_DIR}/dt-folding.c
${CMAKE_CURRENT_SOURCE_DIR}/DGraph.c
${CMAKE_CURRENT_SOURCE_DIR}/DGraph.h
- PARENT_SCOPE)
+ PARENT_SCOPE)
+set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/README.install PARENT_SCOPE)
\ No newline at end of file
#define HAVE_JEDULE @HAVE_JEDULE@ /* Was Jedule compiled in? */
#define HAVE_LUA @HAVE_LUA@ /* Was the Lua support compiled in? */
-#define HAVE_MALLOCATOR @HAVE_MALLOCATOR@ /* Whether mallocators (object pools) were activated at compilation time. */
+#define HAVE_MALLOCATOR @HAVE_MALLOCATOR@ /* Were mallocators (object pools) compiled in? */
#define HAVE_MC @HAVE_MC@ /* Was the model-checking compiled in? */
#define HAVE_NS3 @HAVE_NS3@ /* Was the NS3 support compiled in? */
#ifndef XBT_BASE_H
#define XBT_BASE_H
-#include "simgrid_config.h"
-
/* Define _GNU_SOURCE for getline, isfinite, etc. */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
This file was then part of the GNU C Library. */
-#ifndef MMALLOC_H
-#define MMALLOC_H 1
+#ifndef SIMGRID_MMALLOC_H
+#define SIMGRID_MMALLOC_H 1
#include "src/internal_config.h"
-#ifdef HAVE_MMALLOC
+#if HAVE_MMALLOC
-#ifdef HAVE_STDDEF_H
-# include <stddef.h>
-#else
-# include <sys/types.h> /* for size_t */
-# include <stdio.h> /* for NULL */
-#endif
+# include <sys/types.h> /* for size_t */
+# include <stdio.h> /* for NULL */
#include "xbt/dynar.h"
#include "xbt/dict.h"
SG_END_DECL()
#endif
-#endif /* MMALLOC_H */
+#endif /* SIMGRID_MMALLOC_H */
#ifndef SIMGRID_XBT_SIGNAL_HPP
#define SIMGRID_XBT_SIGNAL_HPP
+#include "simgrid_config.h"
#if SIMGRID_HAVE_LIBSIG
#include <sigc++/sigc++.h>
#else
#ifndef SIMGRIC_XBT_STRING_HPP
#define SIMGRIC_XBT_STRING_HPP
+#include "src/internal_config.h"
#if HAVE_MC
#include <stdexcept>
* @{
*/
-#if defined(_MSC_VER) && !defined(strdup)
-# define strdup _strdup /* POSIX name is not ANSI complient blabla */
-#endif
-
/** @brief Like strdup, but xbt_die() on error */
static XBT_ALWAYS_INLINE char *xbt_strdup(const char *s) {
char *res = NULL;
* between processes.
*/
public class Comm {
- /**
- * Indicates if the communication is a receiving communication
- */
+ /** Indicates if the communication is a receiving communication */
protected boolean receiving;
- /**
- * Indicates if the communication is finished
- */
+ /** Indicates if the communication is finished */
protected boolean finished = false;
/**
* Represents the bind between the java comm and the
* automatically set.
*/
private long bind = 0;
- /**
- * Represents the bind for the task object pointer. Don't touch it.
- */
+ /** Represents the bind for the task object pointer. Don't touch it. */
private long taskBind = 0;
- /**
- * Task associated with the comm. Beware, it can be null
- */
+ /** Task associated with the comm. Beware, it can be null */
protected Task task = null;
/**
* Protected constructor, used by Comm factories
return task;
}
- /**
- * Class initializer, to initialize various JNI stuff
- */
+ /** Class initializer, to initialize various JNI stuff */
public static native void nativeInit();
static {
org.simgrid.NativeLib.nativeInit();
* @param nMemb is the number of elements of data to write
*/
public native long write(long size, long nMemb);
- /**
- * Close the file.
- */
+ /** Close the file. */
public native void close();
/** Class initializer, to initialize various JNI stuff */
* @see Host.getByName().
*/
private long bind;
- /**
- * Host name
- */
protected String name;
- /**
- * User data.
- */
+ /** User data. */
private Object data;
- /**
- *
- */
protected Host() {
this.bind = 0;
this.data = null;
*/
public native static Host getByName(String name)
throws HostNotFoundException, NullPointerException;
- /**
- * This static method returns the count of the installed hosts.
- *
- * @return The count of the installed hosts.
- */
+ /** Counts the installed hosts. */
public native static int getCount();
- /**
- * This static method return an instance to the host of the current process.
- *
- * @return The host on which the current process is executed.
- */
+ /** Returns the host of the current process. */
public native static Host currentHost();
- /**
- * This static method returns all of the hosts of the installed platform.
- *
- * @return An array containing all the hosts installed.
- *
- */
+ /** Returns all hosts of the installed platform. */
public native static Host[] all();
/**
public static native void setAsyncMailbox(String mailboxName);
- /**
- * This method returns the name of a host.
- * @return The name of the host.
- *
- */
+ /** Returns the name of an host. */
public String getName() {
return name;
}
- /**
- * Sets the data of the host.
- * @param data
- */
+ /** Sets the user data of the host. */
public void setData(Object data) {
this.data = data;
}
- /**
- * Gets the data of the host.
- *
- * @return The data object associated with the host.
- */
+ /** Gets the user data of the host. */
public Object getData() {
return this.data;
}
-
- /**
- * Checks whether a host has data.
- *
- * @return True if the host has an associated data object.
- */
+ /** Returns true if the host has an associated data object. */
public boolean hasData() {
return null != this.data;
}
- /**
- * This method start the host if it is off
- */
+ /** Starts the host if it is off */
public native void on();
-
- /**
- * This method stop the host if it is on
- */
+ /** Stops the host if it is on */
public native void off();
/**
- * This method returns the speed of the processor of a host,
+ * This method returns the speed of the processor of a host (in flops),
* regardless of the current load of the machine.
- *
- * @return The speed of the processor of the host in flops.
- *
*/
public native double getSpeed();
-
- /**
- * This method returns the number of core of a host.
- *
- * @return The speed of the processor of the host in flops.
- *
- */
+ /** Returns the number of core of a host. */
public native double getCoreNumber();
- /**
- * Returns the value of a given host property.
- */
+ /** Returns the value of a given host property. */
public native String getProperty(String name);
-
- /**
- * Change the value of a given host property.
- */
+ /** Changes the value of a given host property. */
public native void setProperty(String name, String value);
-
- /** This method tests if a host is up and running.
- * @return True if the host is available.
- */
+ /** Tests if an host is up and running. */
public native boolean isOn();
- /** This methods returns the list of mount point names on an host
- * @return An array containing all mounted storages on the host
- */
+ /** Returns the list of mount point names on an host */
public native Storage[] getMountedStorage();
-
- /** This methods returns the list of storages attached to an host
- * @return An array containing all storages (name) attached to the host
- */
+ /** This methods returns the list of storages (names) attached to an host */
public native String[] getAttachedStorage();
/** Returns the amount of Joules consumed by that host so far */
public native double getConsumedEnergy();
- /**
- * Class initializer, to initialize various JNI stuff
- */
+ /** Class initializer, to initialize various JNI stuff */
public static native void nativeInit();
static {
nativeInit();
-/* This exception is raised when looking for a non-existing host. */
-
/* Copyright (c) 2006-2014. The SimGrid Team.
* All rights reserved. */
package org.simgrid.msg;
-/**
- * This exception is raised when the host on which you are running has just been rebooted.
- */
+/** This exception is raised when the host on which you are running has just been rebooted. */
public class HostFailureException extends MsgException {
private static final long serialVersionUID = 1L;
public HostFailureException() {
super();
}
- /**
- * Constructs an <code>HostFailureException</code> with a detail message.
- *
- * @param s the detail message.
- */
+ /** Constructs an <code>HostFailureException</code> with a detail message. */
public HostFailureException(String s) {
super(s);
}
-/* This exception is raised when looking for a non-existing host. */
-
/* Copyright (c) 2006-2014. The SimGrid Team.
* All rights reserved. */
package org.simgrid.msg;
-/**
- * This exception is raised when looking for a non-existing host.
- */
+/** This exception is raised when looking for a non-existing host. */
public class HostNotFoundException extends MsgException {
private static final long serialVersionUID = 1L;
public HostNotFoundException() {
super();
}
- /**
- * Constructs an <code>HostNotFoundException</code> with a detail message.
- *
- * @param s the detail message.
- */
+ /** Constructs an <code>HostNotFoundException</code> with a detail message. */
public HostNotFoundException(String s) {
super(s);
}
private static final long serialVersionUID = 1L;
- /**
- * Constructs an <code>JniException</code> without a
- * detail message.
- */
+ /** Constructs an <code>JniException</code> without a detail message. */
public JniException() {
super();
}
- /**
- * Constructs an <code>JniException</code> with a detail message.
- *
- * @param s the detail message.
- */ public JniException(String s) {
+ /** Constructs an <code>JniException</code> with a detail message. */
+ public JniException(String s) {
super(s);
- }
+ }
public JniException(String string, Exception e) {
super(string,e);
}
public final class Msg {
- /** Retrieve the simulation time
- * @return The simulation time.
- */
+ /** Retrieves the simulation time */
public final static native double getClock();
- /**
- * Issue a debug logging message.
- * @param s message to log.
- */
- public final static native void debug(String s);
- /**
- * Issue an verbose logging message.
- * @param s message to log.
- */
- public final static native void verb(String s);
-
- /** Issue an information logging message
- * @param s
- */
- public final static native void info(String s);
- /**
- * Issue an warning logging message.
- * @param s message to log.
- */
- public final static native void warn(String s);
- /**
- * Issue an error logging message.
- * @param s message to log.
- */
- public final static native void error(String s);
- /**
- * Issue an critical logging message.
- * @param s message to log.
- */
+ /** Issue a debug logging message. */
+ public final static native void debug(String msg);
+ /** Issue a verbose logging message. */
+ public final static native void verb(String msg);
+ /** Issue an information logging message */
+ public final static native void info(String msg);
+ /** Issue a warning logging message. */
+ public final static native void warn(String msg);
+ /** Issue an error logging message. */
+ public final static native void error(String msg);
+ /** Issue a critical logging message. */
public final static native void critical(String s);
/*********************************************************************************
* Deployment and initialization related functions *
*********************************************************************************/
- /**
- * The natively implemented method to initialize a MSG simulation.
+ /** Initialize a MSG simulation.
*
* @param args The arguments of the command line of the simulation.
*/
/** Tell the kernel that you want to use the energy plugin */
public final static native void energyInit();
- /**
- * Run the MSG simulation.
+ /** Run the MSG simulation.
*
* The simulation is not cleaned afterward (see
* {@link #clean()} if you really insist on cleaning the C side), so you can freely
@Deprecated
public final static void clean(){}
- /**
- * The native implemented method to create the environment of the simulation.
- *
- * @param platformFile The XML file which contains the description of the environment of the simulation
- *
- */
+ /** Create the simulation environment by parsing a platform file. */
public final static native void createEnvironment(String platformFile);
public final static native As environmentGetRoutingRoot();
- /**
- * The method to deploy the simulation.
- *
- *
- * @param deploymentFile
- */
+ /** Starts your processes by parsing a deployment file. */
public final static native void deployApplication(String deploymentFile);
/** Example launcher. You can use it or provide your own launcher, as you wish
package org.simgrid.msg;
-/**
- * This exception is an abstract class grouping all MSG-related exceptions
- *
- * <!--
- * DOXYGEN_NAVBAR_CHILD "HostNotFoundException"=classsimgrid_1_1msg_1_1HostNotFoundException.html
- * DOXYGEN_NAVBAR_CHILD "JniException"=classsimgrid_1_1msg_1_1JniException.html
- * DOXYGEN_NAVBAR_CHILD "NativeException"=classsimgrid_1_1msg_1_1NativeException.html
- * DOXYGEN_NAVBAR_CHILD "ProcessNotFoundException"=classsimgrid_1_1msg_1_1ProcessNotFoundException.html
- * -->
- */
+/** This exception is an abstract class grouping all MSG-related exceptions */
public abstract class MsgException extends Exception {
private static final long serialVersionUID = 1L;
- /**
- * Constructs an <code>MsgException</code> without a
- * detail message.
- */
+ /** Constructs an <code>MsgException</code> without a detail message. */
public MsgException() {
super();
}
- /**
- * Constructs an <code>MsgException</code> with a detail message.
- *
- * @param s the detail message.
- */
- public MsgException(String s) {
- super(s);
+ /** Constructs an <code>MsgException</code> with a detail message. */
+ public MsgException(String msg) {
+ super(msg);
}
}
/** A mutex implemented on top of SimGrid synchronization mechanisms.
* You can use it exactly the same way that you use the mutexes,
* but to handle the interactions between the processes within the simulation.
- *
+ *
+ * Don't mix simgrid synchronization with Java native one, or it will deadlock!
*/
public class Mutex {
private long bind; // The C object -- don't touch it
public native void acquire();
public native void release();
- /**
- * Class initializer, to initialize various JNI stuff
- */
+ /** Class initializer, to initialize various JNI stuff */
public static native void nativeInit();
static {
org.simgrid.NativeLib.nativeInit();
package org.simgrid.msg;
-/**
- * This exception is raised when there is an error within the C world of SimGrid.
- * Refer to the string message for more info on what went wrong.
- */
+/** This exception is raised when there is an error within the C world of SimGrid. */
public class NativeException extends MsgException {
private static final long serialVersionUID = 1L;
- /**
- * Constructs an <code>NativeException</code> with a detail message.
- *
- * @param s the detail message.
- */
+ /** Constructs an <code>NativeException</code> with a detail message. */
public NativeException(String s) {
super(s);
}
* access to it. It is set automatically during the build of the object.
*/
private long bind;
- /**
- * Indicates if the process is started
- */
+ /** Indicates if the process is started */
boolean started;
/**
* Even if this attribute is public you must never access to it.
/** Time at which the process should be created */
protected double startTime = 0;
- /** Time at which th
- * Kill time of the process
+ /** Time at which the process should be killed.
*
* Set at creation, and used internally by SimGrid
*/
public Vector<String> args;
- /**
- * Default constructor
- */
+ /** Default constructor */
protected Process() {
this.id = nextProcessId++;
this.name = null;
#include <src/internal_config.h>
#include <xbt/base.h>
-#ifdef HAVE_UCONTEXT_H
+#if HAVE_UCONTEXT_H
#include <ucontext.h> /* context relative declarations */
#endif
typedef struct s_stack_region{
void *address;
-#ifdef HAVE_UCONTEXT_H
+#if HAVE_UCONTEXT_H
ucontext_t* context;
#endif
size_t size;
#include <src/internal_config.h>
#include <simgrid/simix.h>
#include <simgrid/modelchecker.h> /* our public interface (and definition of HAVE_MC) */
-#ifdef HAVE_UCONTEXT_H
+#if HAVE_UCONTEXT_H
#include <ucontext.h> /* context relative declarations */
#endif
XBT_PUBLIC(void) MC_remove_ignore_heap(void *address, size_t size);
XBT_PUBLIC(void) MC_ignore_local_variable(const char *var_name, const char *frame);
XBT_PUBLIC(void) MC_ignore_global_variable(const char *var_name);
-#ifdef HAVE_UCONTEXT_H
+#if HAVE_UCONTEXT_H
XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size);
#endif
#ifndef _SURF_MAXMIN_H
#define _SURF_MAXMIN_H
-#include "src/portable.h"
+#include "src/internal_config.h"
#include "xbt/misc.h"
#include "xbt/asserts.h"
#include "surf/datatypes.h"
#include "xbt/graph.h"
#include "xbt/misc.h"
#include "xbt/config.h"
-#include "src/portable.h"
+#include "src/internal_config.h"
#include "surf/surf_routing.h"
#include "surf/datatypes.h"
#include "xbt/lib.h"
continue;
}
- RemotePtr<void> page = remote(addr.address() + (i << xbt_pagebits));
- xbt_assert(mc_page_offset((void*)page.address())==0,
+ RemotePtr<void> page = remote((void*)
+ simgrid::mc::mmu::join(i, addr.address()));
+ xbt_assert(simgrid::mc::mmu::split(page.address()).second == 0,
"Not at the beginning of a page");
/* Adding another copy (and a syscall) will probably slow things a lot.
#include <string>
#include <unordered_map>
+#include <memory>
#include <vector>
#include <xbt/base.h>
+#include "src/xbt/memory_map.hpp"
#include "src/mc/mc_forward.h"
#include "src/mc/Type.hpp"
#include "src/mc/Frame.hpp"
const char* name, const char* scope);
};
-
+XBT_PRIVATE std::shared_ptr<ObjectInformation> createObjectInformation(
+ std::vector<simgrid::xbt::VmMap> const& maps, const char* name);
+XBT_PRIVATE void postProcessObjectInformation(
+ simgrid::mc::Process* process, simgrid::mc::ObjectInformation* info);
}
}
inline __attribute__((always_inline))
const void* PageStore::get_page(std::size_t pageno) const
{
- return mc_page_from_number(this->memory_, pageno);
+ return (void*) simgrid::mc::mmu::join(pageno, (std::uintptr_t) this->memory_);
}
inline __attribute__((always_inline))
#include <xbt/base.h>
#include <xbt/mmalloc.h>
-#include "src/mc/mc_object_info.h"
#include "src/mc/mc_unw.h"
#include "src/mc/mc_snapshot.h"
#include "src/mc/mc_ignore.h"
static char* get_lib_name(const char* pathname, struct s_mc_memory_map_re* res)
{
- const char* map_basename = xbt_basename((char*) pathname);
+ char* map_basename = xbt_basename(pathname);
regmatch_t match;
- if(regexec(&res->so_re, map_basename, 1, &match, 0))
+ if(regexec(&res->so_re, map_basename, 1, &match, 0)) {
+ free(map_basename);
return nullptr;
+ }
char* libname = strndup(map_basename, match.rm_so);
+ free(map_basename);
+ map_basename = nullptr;
// Strip the version suffix:
if(libname && !regexec(&res->version_re, libname, 1, &match, 0)) {
const char* current_name = nullptr;
- this->object_infos.resize(0);
+ this->object_infos.clear();
for (size_t i=0; i < maps.size(); i++) {
simgrid::xbt::VmMap const& reg = maps[i];
}
std::shared_ptr<simgrid::mc::ObjectInformation> info =
- MC_find_object_info(this->memory_map_, pathname);
+ simgrid::mc::createObjectInformation(this->memory_map_, pathname);
this->object_infos.push_back(info);
if (is_executable)
this->binary_info = info;
// Resolve time (including accross differents objects):
for (auto const& object_info : this->object_infos)
- MC_post_process_object_info(this, object_info.get());
+ postProcessObjectInformation(this, object_info.get());
xbt_assert(this->maestro_stack_start_, "Did not find maestro_stack_start");
xbt_assert(this->maestro_stack_end_, "Did not find maestro_stack_end");
std::shared_ptr<simgrid::mc::ObjectInformation> const& info =
this->find_object_info_rw((void*)address.address());
// Segment overlap is not handled.
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if (info.get() && this->privatized(*info)) {
if (process_index < 0)
xbt_die("Missing process index");
"Not at the beginning of a page");
xbt_assert((((uintptr_t)permanent_addr) & (xbt_pagesize-1)) == 0,
"Not at the beginning of a page");
- size_t page_count = mc_page_count(size);
+ size_t page_count = simgrid::mc::mmu::chunkCount(size);
std::vector<std::uint64_t> pagemap;
const size_t* ref_page_numbers = nullptr;
if (use_soft_dirty) {
pagemap.resize(page_count);
process->read_pagemap(pagemap.data(),
- mc_page_number(nullptr, permanent_addr), page_count);
+ simgrid::mc::mmu::split((std::size_t) permanent_addr).first, page_count);
ref_page_numbers = ref_region->page_data().pagenos();
}
#include <unistd.h>
+#include <fcntl.h>
#include <string.h>
#include <link.h>
#include <dirent.h>
#include "src/mc/mc_private.h"
#include "xbt/module.h"
#include <xbt/mmalloc.h>
+#include <xbt/memory.hpp>
#include "src/smpi/private.h"
#include "src/xbt/mmalloc/mmprivate.h"
}
}
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
RegionSnapshot privatized_region(
RegionType region_type, void *start_addr, void* permanent_addr,
std::size_t size, const RegionSnapshot* ref_region
ref_region = mc_model_checker->parent_snapshot_->snapshot_regions[index].get();
simgrid::mc::RegionSnapshot region;
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
const bool privatization_aware = object_info
&& mc_model_checker->process().privatized(*object_info);
if (privatization_aware && MC_smpi_process_count())
heap->heaplimit,
process->get_malloc_info());
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if (mc_model_checker->process().privatized() && MC_smpi_process_count())
// snapshot->privatization_index = smpi_loaded_page
mc_model_checker->process().read_variable(
std::vector<simgrid::xbt::VmMap> const& maps,
simgrid::mc::ObjectInformation* result)
{
- char* file_name = xbt_strdup(result->file_name.c_str());
- const char *name = xbt_basename(file_name);
+ char* name = xbt_basename(result->file_name.c_str());
+
for (size_t i = 0; i < maps.size(); ++i) {
simgrid::xbt::VmMap const& reg = maps[i];
- if (maps[i].pathname.empty()
- || strcmp(xbt_basename(maps[i].pathname.c_str()), name)) {
- // Nothing to do
- } else if ((reg.prot & PROT_WRITE)) {
+ if (maps[i].pathname.empty())
+ continue;
+ char* map_basename = xbt_basename(maps[i].pathname.c_str());
+ if (strcmp(name, map_basename) != 0) {
+ free(map_basename);
+ continue;
+ }
+ free(map_basename);
+ if ((reg.prot & PROT_WRITE)) {
xbt_assert(!result->start_rw,
"Multiple read-write segments for %s, not supported",
maps[i].pathname.c_str());
xbt_assert(result->start_rw);
xbt_assert(result->start_exec);
- free(file_name);
+
+ free(name);
}
/************************************* Take Snapshot ************************************/
link[res] = '\0';
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if(smpi_is_privatisation_file(link))
continue;
#endif
continue;
// If dot_output enabled, do not handle the corresponding file
- if (dot_output != nullptr && strcmp(xbt_basename(link), _sg_mc_dot_output_file) == 0)
- continue;
+ if (dot_output != nullptr) {
+ char* link_basename = xbt_basename(link);
+ if (strcmp(link_basename, _sg_mc_dot_output_file) == 0) {
+ free(link_basename);
+ continue;
+ }
+ free(link_basename);
+ }
// This is probably a shared memory used by lttng-ust:
if(strncmp("/dev/shm/ust-shm-tmp-", link, 21)==0)
restore(region.get());
}
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
// TODO, send a message to implement this in the MCed process
if(snapshot->privatization_index >= 0) {
// Fix the privatization mmap:
#include "src/mc/ObjectInformation.hpp"
#include "src/mc/Variable.hpp"
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
#include "src/smpi/private.h"
#endif
{
xbt_assert(r1 && r2, "Missing region.");
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if (r1->storage_type() == simgrid::mc::StorageType::Privatized) {
xbt_assert(process_index >= 0);
if (r2->storage_type() != simgrid::mc::StorageType::Privatized)
#include <memory>
#include <utility>
+#include <fcntl.h>
#include <cstdlib>
#define DW_LANG_Objc DW_LANG_ObjC /* fix spelling error in older dwarf.h */
#include <dwarf.h>
#include "src/mc/mc_private.h"
#include "src/mc/mc_dwarf.hpp"
-#include "src/mc/mc_object_info.h"
#include "src/mc/Process.hpp"
#include "src/mc/ObjectInformation.hpp"
#include "src/mc/Variable.hpp"
}
/** Base directories for external debug files */
+static
const char* debug_paths[] = {
"/usr/lib/debug/",
"/usr/local/lib/debug/",
}
}
+namespace simgrid {
+namespace mc {
+
/** \brief Finds informations about a given shared object/executable */
-std::shared_ptr<simgrid::mc::ObjectInformation> MC_find_object_info(
+std::shared_ptr<simgrid::mc::ObjectInformation> createObjectInformation(
std::vector<simgrid::xbt::VmMap> const& maps, const char *name)
{
std::shared_ptr<simgrid::mc::ObjectInformation> result =
/*************************************************************************/
-void MC_post_process_object_info(simgrid::mc::Process* process, simgrid::mc::ObjectInformation* info)
+void postProcessObjectInformation(simgrid::mc::Process* process, simgrid::mc::ObjectInformation* info)
{
for (auto& i : info->types) {
}
}
+}
+}
+
namespace simgrid {
namespace dwarf {
region.block =
((char *) stack -
(char *) heap->heapbase) / BLOCKSIZE + 1;
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if (smpi_privatize_global_variables && process)
region.process_index = smpi_process_index_of_smx_process(process);
else
#include <simgrid_config.h>
-SG_BEGIN_DECL()
+
+namespace simgrid {
+namespace mc {
+// TODO, do not depend on xbt_pagesize/xbt_pagebits but our own chunk size
+namespace mmu {
+
+static int chunkSize()
+{
+ return xbt_pagesize;
+}
/** @brief How many memory pages are necessary to store size bytes?
*
* @return Number of memory pages
*/
static inline __attribute__ ((always_inline))
-size_t mc_page_count(size_t size)
+std::size_t chunkCount(std::size_t size)
{
size_t page_count = size >> xbt_pagebits;
if (size & (xbt_pagesize-1))
return page_count;
}
-/** @brief Get the virtual memory page number of a given address
- *
- * @param address Address
- * @return Virtual memory page number of the given address
- */
+/** @brief Split into chunk number and remaining offset */
static inline __attribute__ ((always_inline))
-size_t mc_page_number(const void* base, const void* address)
+std::pair<std::size_t, std::uintptr_t> split(std::uintptr_t offset)
{
- xbt_assert(address>=base, "The address is not in the range");
- return ((std::uintptr_t) address - (std::uintptr_t) base) >> xbt_pagebits;
+ return {
+ offset >> xbt_pagebits,
+ offset & (xbt_pagesize-1)
+ };
}
-/** @brief Get the offset of an address within a memory page
- *
- * @param address Address
- * @return Offset within the memory page
- */
+/** Merge chunk number and remaining offset info a global offset */
static inline __attribute__ ((always_inline))
-size_t mc_page_offset(const void* address)
+std::uintptr_t join(std::size_t page, std::uintptr_t offset)
{
- return ((std::uintptr_t) address) & (xbt_pagesize-1);
+ return ((std::uintptr_t) page << xbt_pagebits) + offset;
}
-/** @brief Get the virtual address of a virtual memory page
- *
- * @param base Address of the first page
- * @param page Index of the page
- */
static inline __attribute__ ((always_inline))
-void* mc_page_from_number(const void* base, size_t page)
+std::uintptr_t join(std::pair<std::size_t,std::uintptr_t> value)
{
- return (void*) ((char*)base + (page << xbt_pagebits));
+ return join(value.first, value.second);
}
static inline __attribute__ ((always_inline))
-bool mc_same_page(const void* a, const void* b)
+bool sameChunk(std::uintptr_t a, std::uintptr_t b)
{
- return ((std::uintptr_t) a >> xbt_pagebits)
- == ((std::uintptr_t) b >> xbt_pagebits);
+ return (a >> xbt_pagebits) == (b >> xbt_pagebits);
}
-SG_END_DECL()
+}
+}
+}
#endif
+++ /dev/null
-/* Copyright (c) 2007-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. */
-
-#ifndef SIMGRID_MC_OBJECT_INFO_H
-#define SIMGRID_MC_OBJECT_INFO_H
-
-#include <vector>
-#include <memory>
-
-#include <xbt/base.h>
-
-#include "src/mc/mc_forward.hpp"
-#include "src/xbt/memory_map.hpp"
-
-XBT_PRIVATE std::shared_ptr<simgrid::mc::ObjectInformation> MC_find_object_info(
- std::vector<simgrid::xbt::VmMap> const& maps, const char* name);
-XBT_PRIVATE void MC_post_process_object_info(simgrid::mc::Process* process, simgrid::mc::ObjectInformation* info);
-
-#endif
{
for (size_t i = 0; i != pages_copy.page_count(); ++i) {
// Otherwise, copy the page:
- void* target_page = mc_page_from_number(start_addr, i);
+ void* target_page = (void*) simgrid::mc::mmu::join(i, (std::uintptr_t) start_addr);
const void* source_page = pages_copy.page(i);
process->write_bytes(source_page, xbt_pagesize, remote(target_page));
}
{
xbt_assert(((reg->permanent_address().address()) & (xbt_pagesize-1)) == 0,
"Not at the beginning of a page");
- xbt_assert(mc_page_count(reg->size()) == reg->page_data().page_count());
+ xbt_assert(simgrid::mc::mmu::chunkCount(reg->size()) == reg->page_data().page_count());
mc_restore_page_snapshot_region(process,
(void*) reg->permanent_address().address(), reg->page_data());
}
return info->name.c_str();
}
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
int MC_smpi_process_count(void)
{
if (mc_mode == MC_MODE_CLIENT)
continue;
if (region->storage_type() == simgrid::mc::StorageType::Privatized) {
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
// Use the current process index of the snapshot:
if (process_index == simgrid::mc::ProcessIndexDisabled)
process_index = snapshot->privatization_index;
// Last byte of the memory area:
void* end = (char*) addr + size - 1;
+ // TODO, we assume the chunks are aligned to natural chunk boundaries.
+ // We should remove this assumption.
+
// Page of the last byte of the memory area:
- size_t page_end = mc_page_number(nullptr, end);
+ size_t page_end = simgrid::mc::mmu::split((std::uintptr_t) end).first;
void* dest = target;
xbt_die("Missing destination buffer for fragmented memory access");
// Read each page:
- while (mc_page_number(nullptr, addr) != page_end) {
+ while (simgrid::mc::mmu::split((std::uintptr_t) addr).first != page_end) {
void* snapshot_addr = mc_translate_address_region_chunked((uintptr_t) addr, region);
- void* next_page = mc_page_from_number(nullptr, mc_page_number(NULL, addr) + 1);
+ void* next_page = (void*) simgrid::mc::mmu::join(
+ simgrid::mc::mmu::split((std::uintptr_t) addr).first + 1,
+ 0);
size_t readable = (char*) next_page - (char*) addr;
memcpy(dest, snapshot_addr, readable);
addr = (char*) addr + readable;
static inline __attribute__((always_inline))
void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region)
{
- size_t pageno = mc_page_number((void*)region->start().address(), (void*) addr);
- const void* snapshot_page =
- region->page_data().page(pageno);
- return (char*) snapshot_page + mc_page_offset((void*) addr);
+ auto split = simgrid::mc::mmu::split(addr - region->start().address());
+ auto pageno = split.first;
+ auto offset = split.second;
+ const void* snapshot_page = region->page_data().page(pageno);
+ return (char*) snapshot_page + offset;
}
static inline __attribute__((always_inline))
{
// Last byte of the region:
void* end = (char*) addr + size - 1;
- if (mc_same_page(addr, end) ) {
+ if (simgrid::mc::mmu::sameChunk((std::uintptr_t) addr, (std::uintptr_t) end) ) {
// The memory is contained in a single page:
return mc_translate_address_region_chunked((uintptr_t) addr, region);
} else {
// Take a copy of the context for our own purpose:
context->context = *c;
-#if defined(PROCESSOR_x86_64) || defined(PROCESSOR_i686)
+#if SIMGRID_PROCESSOR_x86_64 || SIMGRID_PROCESSOR_i686
// On x86_64, ucontext_t contains a pointer to itself for FP registers.
// We don't really need support for FR registers as they are caller saved
// and probably never use those fields as libunwind-x86_64 does not read
#include <sys/types.h>
#include <sys/uio.h>
+#include <fcntl.h>
#include <libunwind.h>
#include <libunwind-ptrace.h>
pid_t pid = _UPT_getpid(arg);
size_t size = sizeof(unw_word_t);
-#ifdef HAVE_PROCESS_VM_READV
+#if HAVE_PROCESS_VM_READV
// process_vm_read implementation.
// This is only available since Linux 3.2.
#include <utility>
+#include <fcntl.h>
#include <signal.h>
#include <poll.h>
+++ /dev/null
-/* portable -- header loading to write portable code within SimGrid */
-
-/* Copyright (c) 2004, 2016. 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. */
-
-#ifndef SIMGRID_PORTABLE_H
-#define SIMGRID_PORTABLE_H
-
-#include "simgrid_config.h" /* what was compiled in? */
-#include "src/internal_config.h" /* some information about the environment */
-
-#include "xbt/base.h"
-#include "xbt/misc.h"
-#ifdef _WIN32
-# include <windows.h>
-#endif
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_SYSCTL_H
-# include <sys/sysctl.h>
-#endif
-
-/* File handling */
-
-#include <fcntl.h>
-
-#ifdef _WIN32
- #ifndef EWOULDBLOCK
- #define EWOULDBLOCK WSAEWOULDBLOCK
- #endif
-
- #ifndef EINPROGRESS
- #define EINPROGRESS WSAEINPROGRESS
- #endif
-
- #ifndef ETIMEDOUT
- #define ETIMEDOUT WSAETIMEDOUT
- #endif
-
- #ifdef S_IRGRP
- #undef S_IRGRP
- #endif
- #define S_IRGRP 0
-
- #ifdef S_IWGRP
- #undef S_IWGRP
- #endif
- #define S_IWGRP 0
-#endif
-
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
-
-/* Time handling */
-#include <sys/time.h>
-#include <time.h>
-
-/* Signals */
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-
-/* What we need to extract the backtrace in exception handling code */
-#ifdef HAVE_EXECINFO_H
-# include <execinfo.h>
-#endif
-
-#endif /* SIMGRID_PORTABLE_H */
}
if (!acyclic_graph_detail(result)){
- XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", xbt_basename(filename));
+ char* base = xbt_basename(filename);
+ XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", base);
+ free(base);
xbt_dynar_foreach(result, cpt, file)
SD_task_destroy(file);
xbt_dynar_free_container(&result);
/* 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 "src/internal_config.h"
#include "src/simdag/simdag_private.h"
#include "simgrid/simdag.h"
#include "xbt/file.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
-#ifdef HAVE_GRAPHVIZ
+#if HAVE_GRAPHVIZ
#include <graphviz/cgraph.h>
#endif
}
if (result && !acyclic_graph_detail(result)) {
- XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", xbt_basename((char*)filename));
+ char* base = xbt_basename(filename);
+ XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base);
+ free(base);
xbt_dynar_free(&result);
result = NULL;
}
#include "simgrid/simix.h"
#include "simgrid/sg_config.h"
#include "simgrid_config.h" /* what was compiled in? */
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
#include "smpi/smpi_interface.h"
#endif
#include "mc/mc.h"
sg_weight_S_parameter = xbt_cfg_get_double(_sg_cfg_set, name);
}
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
/* callback of the mpi collectives */
static void _sg_cfg_cb__coll(const char *category,
s_mpi_coll_description_t * table,
sprintf(description,
"Context factory to use in SIMIX. Possible values: %s",
dflt_ctx_fact);
-#ifdef HAVE_UCONTEXT_CONTEXTS
+#if HAVE_UCONTEXT_CONTEXTS
dflt_ctx_fact = "ucontext";
p += sprintf(p, ", %s", dflt_ctx_fact);
#endif
-#ifdef HAVE_RAW_CONTEXTS
+#if HAVE_RAW_CONTEXTS
dflt_ctx_fact = "raw";
p += sprintf(p, ", %s", dflt_ctx_fact);
#endif
xbt_cfg_register(&_sg_cfg_set, "contexts/synchro",
"Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)",
xbt_cfgelm_string, 1, 1, _sg_cfg_cb_contexts_parallel_mode);
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/synchro", "futex");
#else //No futex on mac and posix is unimplememted yet
xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/synchro", "busy_wait");
xbt_cfgelm_string, 1, 1, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/IB_penalty_factors", "0.965;0.925;1.35");
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
xbt_cfg_register(&_sg_cfg_set, "smpi/running_power",
"Power of the host running the simulation (in flop/s). Used to bench the operations.",
xbt_cfgelm_double, 1, 1, NULL);
void resume();
};
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
class BoostParallelContext : public BoostContext {
public:
BoostParallelContext(std::function<void()> code,
{
BoostContext::parallel_ = SIMIX_context_is_parallel();
if (BoostContext::parallel_) {
-#ifndef HAVE_THREAD_CONTEXTS
+#if !HAVE_THREAD_CONTEXTS
xbt_die("No thread support for parallel context execution");
#else
int nthreads = SIMIX_context_get_nthreads();
BoostContextFactory::~BoostContextFactory()
{
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
if (BoostContext::parmap_) {
xbt_parmap_destroy(BoostContext::parmap_);
BoostContext::parmap_ = nullptr;
{
BoostContext* context = nullptr;
if (BoostContext::parallel_)
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
context = this->new_context<BoostParallelContext>(
std::move(code), cleanup_func, process);
#else
void BoostContextFactory::run_all()
{
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
if (BoostContext::parallel_) {
BoostContext::threads_working_ = 0;
xbt_parmap_apply(BoostContext::parmap_,
// BoostParallelContext
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
void BoostParallelContext::suspend()
{
// ***** Loads of static stuff
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
static xbt_parmap_t raw_parmap;
static simgrid::simix::RawContext** raw_workers_context; /* space to save the worker context in each thread */
static uintptr_t raw_threads_working; /* number of threads that have started their work */
rawctx_entry_point_t entry_point, void* arg);
extern "C" void raw_swapcontext(raw_stack_t* old, raw_stack_t new_context);
-#if PROCESSOR_x86_64
+#if SIMGRID_PROCESSOR_x86_64
__asm__ (
#if defined(__APPLE__)
".text\n"
" pop %rdi\n"
" ret\n"
);
-#elif PROCESSOR_i686
+#elif SIMGRID_PROCESSOR_i686
__asm__ (
#if defined(__APPLE__) || defined(_WIN32)
".text\n"
#endif
raw_context_parallel = SIMIX_context_is_parallel();
if (raw_context_parallel) {
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
int nthreads = SIMIX_context_get_nthreads();
xbt_os_thread_key_create(&raw_worker_id_key);
// TODO, lazily init
RawContextFactory::~RawContextFactory()
{
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
if (raw_parmap)
xbt_parmap_destroy(raw_parmap);
xbt_free(raw_workers_context);
void RawContextFactory::run_all_parallel()
{
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
raw_threads_working = 0;
if (raw_parmap == nullptr)
raw_parmap = xbt_parmap_new(
void RawContext::suspend_parallel()
{
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
/* determine the next context */
smx_process_t next_work = (smx_process_t) xbt_parmap_next(raw_parmap);
RawContext* next_context = nullptr;
void RawContext::resume_parallel()
{
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
uintptr_t worker_id = __sync_fetch_and_add(&raw_threads_working, 1);
xbt_os_thread_set_specific(raw_worker_id_key, (void*) worker_id);
RawContext* worker_context = (RawContext*) SIMIX_context_self();
#include "xbt/function_types.h"
#include "smx_private.h"
-#include "src/portable.h" /* loads context system definitions */
+#include "src/internal_config.h" /* loads context system definitions */
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
}
}
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
static xbt_parmap_t sysv_parmap;
static simgrid::simix::ParallelUContext** sysv_workers_context; /* space to save the worker's context in each thread */
static uintptr_t sysv_threads_working; /* number of threads that have started their work */
{
if (SIMIX_context_is_parallel()) {
sysv_parallel = true;
-#ifdef HAVE_THREAD_CONTEXTS /* To use parallel ucontexts a thread pool is needed */
+#if HAVE_THREAD_CONTEXTS /* To use parallel ucontexts a thread pool is needed */
int nthreads = SIMIX_context_get_nthreads();
sysv_parmap = nullptr;
sysv_workers_context = xbt_new(ParallelUContext*, nthreads);
UContextFactory::~UContextFactory()
{
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
if (sysv_parmap)
xbt_parmap_destroy(sysv_parmap);
xbt_free(sysv_workers_context);
void UContextFactory::run_all()
{
if (sysv_parallel) {
- #ifdef HAVE_THREAD_CONTEXTS
+ #if HAVE_THREAD_CONTEXTS
sysv_threads_working = 0;
// Parmap_apply ensures that every working thread get an index in the
// process_to_run array (through an atomic fetch_and_add),
/** Run one particular simulated process on the current thread. */
void ParallelUContext::resume()
{
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
// What is my containing body?
uintptr_t worker_id = __sync_fetch_and_add(&sysv_threads_working, 1);
// Store the number of my containing body in os-thread-specific area :
*/
void ParallelUContext::suspend()
{
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
/* determine the next context */
// Get the next soul to embody now:
smx_process_t next_work = (smx_process_t) xbt_parmap_next(sysv_parmap);
/* 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 "src/portable.h"
+#include "src/internal_config.h"
#include "xbt/log.h"
#include "xbt/swag.h"
#include "xbt/xbt_os_thread.h"
#define _aligned_free __mingw_aligned_free
#endif //MINGW
-#ifdef HAVE_VALGRIND_H
+#if HAVE_VALGRIND_H
# include <valgrind/valgrind.h>
#endif
int smx_context_stack_size_was_set = 0;
int smx_context_guard_size;
int smx_context_guard_size_was_set = 0;
-#ifdef HAVE_THREAD_LOCAL_STORAGE
+#if HAVE_THREAD_LOCAL_STORAGE
static XBT_THREAD_LOCAL smx_context_t smx_current_context_parallel;
#else
static xbt_os_thread_key_t smx_current_context_key = 0;
*/
void SIMIX_context_mod_init(void)
{
-#if defined(HAVE_THREAD_CONTEXTS) && !defined(HAVE_THREAD_LOCAL_STORAGE)
+#if HAVE_THREAD_CONTEXTS && !HAVE_THREAD_LOCAL_STORAGE
/* the __thread storage class is not available on this platform:
* use getspecific/setspecific instead to store the current context in each thread */
xbt_os_thread_key_create(&smx_current_context_key);
if (simgrid::simix::factory_initializer)
simix_global->context_factory = simgrid::simix::factory_initializer();
else { /* use the factory specified by --cfg=contexts/factory:value */
-#if defined(HAVE_THREAD_CONTEXTS)
+#if HAVE_THREAD_CONTEXTS
if (!strcmp(smx_context_factory_name, "thread"))
simix_global->context_factory = simgrid::simix::thread_factory();
#else
if (0);
#endif
-#ifdef HAVE_UCONTEXT_CONTEXTS
+#if HAVE_UCONTEXT_CONTEXTS
else if (!strcmp(smx_context_factory_name, "ucontext"))
simix_global->context_factory = simgrid::simix::sysv_factory();
#endif
-#ifdef HAVE_RAW_CONTEXTS
+#if HAVE_RAW_CONTEXTS
else if (!strcmp(smx_context_factory_name, "raw"))
simix_global->context_factory = simgrid::simix::raw_factory();
#endif
-#ifdef HAVE_BOOST_CONTEXTS
+#if HAVE_BOOST_CONTEXTS
else if (!strcmp(smx_context_factory_name, "boost"))
simix_global->context_factory = simgrid::simix::boost_factory();
#endif
else {
XBT_ERROR("Invalid context factory specified. Valid factories on this machine:");
-#ifdef HAVE_RAW_CONTEXTS
+#if HAVE_RAW_CONTEXTS
XBT_ERROR(" raw: high performance context factory implemented specifically for SimGrid");
#else
XBT_ERROR(" (raw contexts were disabled at compilation time on this machine -- check configure logs for details)");
#endif
-#ifdef HAVE_UCONTEXT_CONTEXTS
+#if HAVE_UCONTEXT_CONTEXTS
XBT_ERROR(" ucontext: classical system V contexts (implemented with makecontext, swapcontext and friends)");
#else
XBT_ERROR(" (ucontext was disabled at compilation time on this machine -- check configure logs for details)");
#endif
-#ifdef HAVE_BOOST_CONTEXTS
+#if HAVE_BOOST_CONTEXTS
XBT_ERROR(" boost: this uses the boost libraries context implementation");
#else
XBT_ERROR(" (boost was disabled at compilation time on this machine -- check configure logs for details. Did you install the libboost-context-dev package?)");
stack = xbt_malloc0(smx_context_stack_size);
}
-#ifdef HAVE_VALGRIND_H
+#if HAVE_VALGRIND_H
unsigned int valgrind_stack_id = VALGRIND_STACK_REGISTER(stack, (char *)stack + smx_context_stack_size);
memcpy((char *)stack + smx_context_usable_stack_size, &valgrind_stack_id, sizeof valgrind_stack_id);
#endif
if (!stack)
return;
-#ifdef HAVE_VALGRIND_H
+#if HAVE_VALGRIND_H
unsigned int valgrind_stack_id;
memcpy(&valgrind_stack_id, (char *)stack + smx_context_usable_stack_size, sizeof valgrind_stack_id);
VALGRIND_STACK_DEREGISTER(valgrind_stack_id);
nb_threads = xbt_os_get_numcores();
XBT_INFO("Auto-setting contexts/nthreads to %d",nb_threads);
}
-#ifndef HAVE_THREAD_CONTEXTS
+#if !HAVE_THREAD_CONTEXTS
xbt_assert(nb_threads == 1, "Parallel runs are impossible when the pthreads are missing.");
#endif
smx_parallel_contexts = nb_threads;
smx_context_t SIMIX_context_get_current(void)
{
if (SIMIX_context_is_parallel()) {
-#ifdef HAVE_THREAD_LOCAL_STORAGE
+#if HAVE_THREAD_LOCAL_STORAGE
return smx_current_context_parallel;
#else
return xbt_os_thread_get_specific(smx_current_context_key);
void SIMIX_context_set_current(smx_context_t context)
{
if (SIMIX_context_is_parallel()) {
-#ifdef HAVE_THREAD_LOCAL_STORAGE
+#if HAVE_THREAD_LOCAL_STORAGE
smx_current_context_parallel = context;
#else
xbt_os_thread_set_specific(smx_current_context_key, context);
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdlib.h>
-#include "src/portable.h"
+#include "src/internal_config.h"
#include "src/surf/surf_interface.hpp"
#include "src/surf/storage_interface.hpp"
}
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if (smpi_enabled() && !smpi_privatize_global_variables) {
-#ifdef HAVE_PRIVATIZATION
+#if HAVE_PRIVATIZATION
fprintf(stderr,
"Try to enable SMPI variable privatization with --cfg=smpi/privatize_global_variables:yes.\n");
#else
#ifndef _SIMIX_PRIVATE_H
#define _SIMIX_PRIVATE_H
+#include "src/internal_config.h"
#include "simgrid/simix.h"
#include "surf/surf.h"
#include "xbt/base.h"
#include "popping_private.h"
#include "smx_synchro_private.h"
+#include <signal.h>
+
#ifdef __cplusplus
#include <simgrid/simix.hpp>
/* We are using the bottom of the stack to save some information, like the
* valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining
* size for the stack. */
-#ifdef HAVE_VALGRIND_H
+#if HAVE_VALGRIND_H
# define smx_context_usable_stack_size \
(smx_context_stack_size - sizeof(unsigned int)) /* for valgrind_stack_id */
#else
process->ppid = SIMIX_process_get_PID(parent_process);
/* SMPI process have their own data segment and
each other inherit from their father */
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
if(smpi_privatize_global_variables){
if( parent_process->pid != 0){
SIMIX_segment_index_set(process, parent_process->segment_index);
process->ppid = SIMIX_process_get_PID(parent_process);
/* SMPI process have their own data segment and
each other inherit from their father */
- #ifdef HAVE_SMPI
+ #if HAVE_SMPI
if(smpi_privatize_global_variables){
if(parent_process->pid != 0){
SIMIX_segment_index_set(process, parent_process->segment_index);
if(smpi_size_data_exe == 0)//no need to switch
return;
-#ifdef HAVE_PRIVATIZATION
+#if HAVE_PRIVATIZATION
if(smpi_loaded_page==-1){//initial switch, do the copy from the real page here
for (int i=0; i< smpi_process_count(); i++){
memcpy(smpi_privatisation_regions[i].address, TOPAGE(smpi_start_data_exe), smpi_size_data_exe);
void smpi_initialize_global_memory_segments(){
-#ifndef HAVE_PRIVATIZATION
+#if !HAVE_PRIVATIZATION
smpi_privatize_global_variables=0;
xbt_die("You are trying to use privatization on a system that does not support it. Don't.");
return;
void smpi_destroy_global_memory_segments(){
if (smpi_size_data_exe == 0)//no need to switch
return;
-#ifdef HAVE_PRIVATIZATION
+#if HAVE_PRIVATIZATION
int i;
for (i=0; i< smpi_process_count(); i++){
if(munmap(smpi_privatisation_regions[i].address, smpi_size_data_exe) < 0) {
return sg_host_get_consumed_energy(SIMIX_host_self());
}
-#ifdef SMPI_FORTRAN
+#if SMPI_FORTRAN
#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
typedef int integer;
/* 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 "src/portable.h"
+#include "src/internal_config.h"
#include "surf_private.h"
#include "surf_interface.hpp"
#include "network_interface.hpp"
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
#endif
future_evt_set = nullptr;
}
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
xbt_parmap_destroy(surf_parmap);
#endif
#include "surf/surf.h"
#include "surf/maxmin.h"
#include "src/surf/trace_mgr.hpp"
+#include <stdio.h>
#define NO_MAX_DURATION -1.0
#line 10 "parserPromela.lex"
#include "simgrid_config.h"
-#ifndef HAVE_UNISTD_H
+#if !HAVE_UNISTD_H
#define YY_NO_UNISTD_H /* hello Windows */
#ifdef _MSC_VER
/* 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 "xbt/automaton.h"
#include "src/internal_config.h"
+#include "xbt/automaton.h"
#include <errno.h>
-#include <string.h> /* strerror */
+#include <string.h> /* strerror */
+#if HAVE_UNISTD_H
+# include <unistd.h> /* isatty */
+#endif
static xbt_automaton_t parsed_automaton;
char* state_id_src;
%{
#include "simgrid_config.h"
-#ifndef HAVE_UNISTD_H
+#if !HAVE_UNISTD_H
#define YY_NO_UNISTD_H /* hello Windows */
#ifdef _MSC_VER
#line 7 "parserPromela.yacc" /* yacc.c:339 */
#include "simgrid_config.h"
-#ifndef HAVE_UNISTD_H
+#if !HAVE_UNISTD_H
#define YY_NO_UNISTD_H /* hello Windows */
#endif
%{
#include "simgrid_config.h"
-#ifndef HAVE_UNISTD_H
+#if !HAVE_UNISTD_H
#define YY_NO_UNISTD_H /* hello Windows */
#endif
/* 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 <unistd.h>
#include <execinfo.h>
#include <sys/stat.h>
/* This is partially inspirated from the OSSP ts (Test Suite Library) */
/* At some point we should use https://github.com/google/googletest instead */
-#include "src/portable.h"
+#include "src/internal_config.h"
+#include <stdio.h>
#include "xbt/sysdep.h" /* bvprintf */
#include "xbt/cunit.h"
#ifdef SIMGRID_TEST
#include "xbt.h"
#include "xbt/ex.h"
-#include "src/portable.h"
+#include "src/internal_config.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
#include <stdio.h>
#include <stdlib.h>
-#include "src/portable.h" /* execinfo when available */
+#include "src/internal_config.h" /* execinfo when available */
#include "xbt/ex.h"
#include "xbt/str.h"
#include "xbt/synchro_core.h"
#include "simgrid/simix.h" /* SIMIX_process_self_get_name() */
#undef HAVE_BACKTRACE
-#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
+#if HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
# define HAVE_BACKTRACE 1 /* Hello linux box */
#endif
xbt_backtrace_display(&e);
}
-#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
+#if HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
# include "src/xbt/backtrace_linux.c"
#else
# include "src/xbt/backtrace_dummy.c"
#include <stdio.h> /* snprintf */
#include <stdlib.h> /* snprintf */
-#include "src/portable.h"
+#include "src/internal_config.h"
#include "src/xbt_modinter.h"
/* Copyright 1996, 2000 Free Software Foundation */
-#ifdef HAVE_UNISTD_H
+#define _GNU_SOURCE
+#include "src/internal_config.h"
+#if HAVE_UNISTD_H
#include <unistd.h> /* Prototypes for lseek, sbrk (maybe) */
#endif
+
#include "mfree.c"
#include "mmalloc.c"
#include "mrealloc.c"
#include <fcntl.h> /* After sys/types.h, at least for dpx/2. */
#include <sys/stat.h>
#include <string.h>
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h> /* Prototypes for lseek */
#endif
#include "mmprivate.h"
Contributed by Fred Fish at Cygnus Support. fnf@cygnus.com */
#include "src/internal_config.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h> /* Prototypes for lseek */
#endif
#include <stdio.h>
#include <xbt/base.h>
#include <xbt/misc.h>
-#include "src/portable.h"
+#include "src/internal_config.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/mmalloc.h"
#include "xbt/ex.h"
#include <atomic>
#include "src/internal_config.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <sys/syscall.h>
#endif
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
#include <linux/futex.h>
#include <limits.h>
#endif
static void xbt_parmap_posix_master_signal(xbt_parmap_t parmap);
static void xbt_parmap_posix_worker_wait(xbt_parmap_t parmap, unsigned round);
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
static void xbt_parmap_futex_master_wait(xbt_parmap_t parmap);
static void xbt_parmap_futex_worker_signal(xbt_parmap_t parmap);
static void xbt_parmap_futex_master_signal(xbt_parmap_t parmap);
/* Create the pool of worker threads */
xbt_parmap_thread_data_t data;
parmap->workers[0] = NULL;
-#ifdef HAVE_PTHREAD_SETAFFINITY
+#if HAVE_PTHREAD_SETAFFINITY
int core_bind = 0;
#endif
for (unsigned int i = 1; i < num_workers; i++) {
data->parmap = parmap;
data->worker_id = i;
parmap->workers[i] = xbt_os_thread_create(NULL, xbt_parmap_worker_main, data, NULL);
-#ifdef HAVE_PTHREAD_SETAFFINITY
+#if HAVE_PTHREAD_SETAFFINITY
xbt_os_thread_bind(parmap->workers[i], core_bind);
if (core_bind != xbt_os_get_numcores())
core_bind++;
static void xbt_parmap_set_mode(xbt_parmap_t parmap, e_xbt_parmap_mode_t mode)
{
if (mode == XBT_PARMAP_DEFAULT) {
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
mode = XBT_PARMAP_FUTEX;
#else
mode = XBT_PARMAP_POSIX;
case XBT_PARMAP_FUTEX:
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
parmap->master_wait_f = xbt_parmap_futex_master_wait;
parmap->worker_signal_f = xbt_parmap_futex_worker_signal;
parmap->master_signal_f = xbt_parmap_futex_master_signal;
}
#endif
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
static void futex_wait(unsigned *uaddr, unsigned val)
{
XBT_VERB("Waiting on futex %p", uaddr);
xbt_os_mutex_release(parmap->ready_mutex);
}
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
/**
* \brief Starts the parmap: waits for all workers to be ready and returns.
*
#include "xbt/sysdep.h" /* xbt_abort() */
#include "src/internal_config.h" /* Do we need vasprintf? */
#include <stdio.h>
+#include <assert.h>
-#if !defined(HAVE_VASPRINTF)
+#if !HAVE_VASPRINTF
#include <stdarg.h> /* vsnprintf */
int vasprintf(char **ptr, const char *fmt, va_list ap);
int vasprintf(char **ptr, const char *fmt, va_list ap)
/* 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 "src/internal_config.h"
#include "xbt/sysdep.h"
#include "src/xbt/log_private.h"
-#ifdef HAVE_SMPI
-#include "src/smpi/private.h" // to access bench_begin/end. Not ultraclean, I confess
-#endif
#include <stdio.h>
static void append_file(xbt_log_appender_t this_, char *str) {
fclose(this_->data);
}
-#ifdef HAVE_SMPI
-void __smpi_bench_dont (void); // Stupid prototype
-void __smpi_bench_dont (void) { /* I'm only a place-holder in case we link without SMPI */; }
-void smpi_bench_begin(void) __attribute__ ((weak, alias ("__smpi_bench_dont")));
-void smpi_bench_end(void) __attribute__ ((weak, alias ("__smpi_bench_dont")));
-#endif
-
XBT_LOG_EXTERNAL_CATEGORY(smpi); // To detect if SMPI is inited
xbt_log_appender_t xbt_log_appender_file_new(char *arg) {
/* 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 "src/portable.h" /* execinfo when available */
+#include "src/internal_config.h" /* execinfo when available */
#include "xbt/synchro_core.h" /* xbt_thread_self_name */
#include "src/xbt/ex_interface.h"
#include "xbt/sysdep.h"
#include "surf/surf.h"
#include <stdio.h>
+#if HAVE_EXECINFO_H
+# include <execinfo.h> /* Function backtrace */
+#endif
+
extern const char *xbt_log_priority_names[8];
static double format_begin_of_time = -1;
break;
case 'b': /* backtrace; called %throwable in LOG4J */
case 'B': /* short backtrace; called %throwable{short} in LOG4J */
-#if defined(HAVE_EXECINFO_H) && defined(HAVE_POPEN) && defined(ADDR2LINE)
+#if HAVE_EXECINFO_H && HAVE_POPEN && defined(ADDR2LINE)
{
xbt_ex_t e;
#include "simgrid/simix.h" /* SIMIX_host_self_get_name */
#include "surf/surf.h"
#include <stdio.h>
-#include "src/portable.h"
+#include "src/internal_config.h"
extern const char *xbt_log_priority_names[8];
extern int xbt_log_no_loc;
#define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
+
#include "xbt/misc.h"
#include "simgrid_config.h"
-#include "src/portable.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
#include "simgrid/sg_config.h"
+#include "src/internal_config.h"
#include <stdio.h>
#ifdef _WIN32
#include <signal.h> /* To silence MSVC on abort() */
#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
static void xbt_preinit(void) {
unsigned int seed = 2147483647;
-#ifndef _WIN32
- xbt_pagesize = sysconf(_SC_PAGESIZE);
-#else
+#ifdef _WIN32
SYSTEM_INFO si;
GetSystemInfo(&si);
xbt_pagesize = si.dwPageSize;
+#elif HAVE_SYSCONF
+ xbt_pagesize = sysconf(_SC_PAGESIZE);
+#else
+ #error Cannot get page size.
#endif
xbt_pagebits = 0;
#include "xbt/sysdep.h"
#include "xbt/file.h" /* this module */
#include "xbt/log.h"
-#include "src/portable.h"
+#include "src/internal_config.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
#ifndef _MSC_VER
#include "libgen.h" /* POSIX dirname */
* The argument is never modified, and the returned value must be freed after use.
*/
char *xbt_dirname(const char *path) {
-#if _MSC_VER
+#ifdef _MSC_VER
char drive[_MAX_DRIVE];
char dir[_MAX_DIR];
errno_t err;
* The argument is never modified, and the returned value must be freed after use.
*/
char *xbt_basename(const char *path) {
-#if _MSC_VER
+#ifdef _MSC_VER
char file[1024];
char ext[1024];
errno_t err;
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/internal_config.h"
-#ifdef HAVE_PTHREAD_SETAFFINITY
+#if HAVE_PTHREAD_SETAFFINITY
#define _GNU_SOURCE
#include <sched.h>
#endif
#include <semaphore.h>
#include <errno.h>
-#if defined(WIN32)
+#if defined(_WIN32)
+#include <windows.h>
#elif defined(__MACH__) && defined(__APPLE__)
#include <stdint.h>
#include <sys/types.h>
#include "xbt/sysdep.h"
#include "xbt/ex.h"
#include "src/xbt/ex_interface.h" /* We play crude games with exceptions */
-#include "src/portable.h"
+#include "src/internal_config.h"
#include "xbt/xbt_os_time.h" /* Portable time facilities */
#include "xbt/xbt_os_thread.h" /* This module */
#include "src/xbt_modinter.h" /* Initialization/finalization of this module */
/* use named sempahore when sem_init() does not work */
-#ifndef HAVE_SEM_INIT
+#if !HAVE_SEM_INIT
static int next_sem_ID = 0;
static xbt_os_mutex_t next_sem_ID_lock;
#endif
thread_mod_inited = 1;
-#ifndef HAVE_SEM_INIT
+#if !HAVE_SEM_INIT
next_sem_ID_lock = xbt_os_mutex_init();
#endif
}
free(main_thread);
main_thread = NULL;
thread_mod_inited = 0;
-#ifndef HAVE_SEM_INIT
+#if !HAVE_SEM_INIT
xbt_os_mutex_destroy(next_sem_ID_lock);
#endif
*/
int xbt_os_thread_bind(xbt_os_thread_t thread, int cpu){
int errcode = 0;
-#ifdef HAVE_PTHREAD_SETAFFINITY
+#if HAVE_PTHREAD_SETAFFINITY
pthread_t pthread = thread->t;
cpu_set_t cpuset;
CPU_ZERO(&cpuset);
}
typedef struct xbt_os_sem_ {
-#ifndef HAVE_SEM_INIT
+#if !HAVE_SEM_INIT
char *name;
#endif
sem_t s;
* Any attempt to use it leads to ENOSYS (function not implemented).
* If such a prehistoric system is detected, do the job with sem_open instead
*/
-#ifdef HAVE_SEM_INIT
+#if HAVE_SEM_INIT
if (sem_init(&(res->s), 0, value) != 0)
THROWF(system_error, errno, "sem_init() failed: %s", strerror(errno));
res->ps = &(res->s);
void xbt_os_sem_destroy(xbt_os_sem_t sem)
{
-#ifdef HAVE_SEM_INIT
+#if HAVE_SEM_INIT
if (sem_destroy(sem->ps) < 0)
THROWF(system_error, errno, "sem_destroy() failed: %s",
strerror(errno));
/* xbt_os_time.c -- portable interface to time-related functions */
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2016. 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 "src/internal_config.h"
#include "xbt/sysdep.h"
-#include "xbt/xbt_os_time.h" /* this module */
#include "xbt/log.h"
-#include "src/portable.h"
+#include "xbt/xbt_os_time.h" /* this module */
#include <math.h> /* floor */
+#include <sys/time.h>
+#include <time.h>
#ifdef _WIN32
#include <sys/timeb.h>
double xbt_os_time(void)
{
-#ifdef HAVE_GETTIMEOFDAY
+#if HAVE_GETTIMEOFDAY
struct timeval tv;
gettimeofday(&tv, NULL);
#elif defined(_WIN32)
struct s_xbt_os_timer {
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
struct timespec start, stop, elapse;
-#elif defined(HAVE_GETTIMEOFDAY) || defined(_WIN32)
+#elif HAVE_GETTIMEOFDAY || defined(_WIN32)
struct timeval start, stop, elapse;
#else
unsigned long int start, stop, elapse;
double xbt_os_timer_elapsed(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec) +
((double) timer->elapse.tv_sec ) +
((((double) timer->stop.tv_nsec) -
((double) timer->start.tv_nsec) + ((double) timer->elapse.tv_nsec )) / 1e9);
-#elif defined(HAVE_GETTIMEOFDAY) || defined(_WIN32)
+#elif HAVE_GETTIMEOFDAY || defined(_WIN32)
return ((double) timer->stop.tv_sec) - ((double) timer->start.tv_sec)
+ ((double) timer->elapse.tv_sec ) +
((((double) timer->stop.tv_usec) -
void xbt_os_walltimer_start(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
timer->elapse.tv_sec = 0;
timer->elapse.tv_nsec = 0;
clock_gettime(CLOCK_REALTIME, &(timer->start));
-#elif defined(HAVE_GETTIMEOFDAY)
+#elif HAVE_GETTIMEOFDAY
timer->elapse.tv_sec = 0;
timer->elapse.tv_usec = 0;
gettimeofday(&(timer->start), NULL);
void xbt_os_walltimer_resume(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_nsec += timer->stop.tv_nsec - timer->start.tv_nsec;
clock_gettime(CLOCK_REALTIME, &(timer->start));
-#elif defined(HAVE_GETTIMEOFDAY)
+#elif HAVE_GETTIMEOFDAY
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
gettimeofday(&(timer->start), NULL);
void xbt_os_walltimer_stop(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
clock_gettime(CLOCK_REALTIME, &(timer->stop));
-#elif defined(HAVE_GETTIMEOFDAY)
+#elif HAVE_GETTIMEOFDAY
gettimeofday(&(timer->stop), NULL);
#elif defined(_WIN32)
FILETIME ft;
void xbt_os_cputimer_start(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
timer->elapse.tv_sec = 0;
timer->elapse.tv_nsec = 0;
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start));
-#elif defined(HAVE_GETTIMEOFDAY)//return time and not cputime in this case
+#elif HAVE_GETTIMEOFDAY //return time and not cputime in this case
timer->elapse.tv_sec = 0;
timer->elapse.tv_usec = 0;
gettimeofday(&(timer->start), NULL);
void xbt_os_cputimer_resume(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_nsec += timer->stop.tv_nsec - timer->start.tv_nsec;
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->start));
-#elif defined(HAVE_GETTIMEOFDAY)
+#elif HAVE_GETTIMEOFDAY
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
gettimeofday(&(timer->start), NULL);
void xbt_os_cputimer_stop(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &(timer->stop));
-#elif defined(HAVE_GETTIMEOFDAY)
+#elif HAVE_GETTIMEOFDAY
gettimeofday(&(timer->stop), NULL);
#elif defined(_WIN32)
HANDLE h = GetCurrentProcess();
void xbt_os_threadtimer_start(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
timer->elapse.tv_sec = 0;
timer->elapse.tv_nsec = 0;
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &(timer->start));
-#elif defined(HAVE_GETTIMEOFDAY) && defined(__MACH__) && defined(__APPLE__)
+#elif HAVE_GETTIMEOFDAY && defined(__MACH__) && defined(__APPLE__)
timer->elapse.tv_sec = 0;
timer->elapse.tv_usec = 0;
mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
thread_info(mach_thread_self(), THREAD_BASIC_INFO, (thread_info_t)thi, &count);
timer->start.tv_usec = thi->system_time.microseconds + thi->user_time.microseconds;
timer->start.tv_sec = thi->system_time.seconds + thi->user_time.seconds;
-#elif defined(HAVE_GETTIMEOFDAY)//return time and not cputime in this case
+#elif HAVE_GETTIMEOFDAY //return time and not cputime in this case
timer->elapse.tv_sec = 0;
timer->elapse.tv_usec = 0;
gettimeofday(&(timer->start), NULL);
void xbt_os_threadtimer_resume(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_nsec += timer->stop.tv_nsec - timer->start.tv_nsec;
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &(timer->start));
-#elif defined(HAVE_GETTIMEOFDAY) && defined(__MACH__) && defined(__APPLE__)
+#elif HAVE_GETTIMEOFDAY && defined(__MACH__) && defined(__APPLE__)
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
thread_info(mach_thread_self(), THREAD_BASIC_INFO, (thread_info_t)thi, &count);
timer->start.tv_usec = thi->system_time.microseconds + thi->user_time.microseconds;
timer->start.tv_sec = thi->system_time.seconds + thi->user_time.seconds;
-#elif defined(HAVE_GETTIMEOFDAY)
+#elif HAVE_GETTIMEOFDAY
timer->elapse.tv_sec += timer->stop.tv_sec - timer->start.tv_sec;
timer->elapse.tv_usec += timer->stop.tv_usec - timer->start.tv_usec;
gettimeofday(&(timer->start), NULL);
void xbt_os_threadtimer_stop(xbt_os_timer_t timer)
{
-#ifdef HAVE_POSIX_GETTIME
+#if HAVE_POSIX_GETTIME
clock_gettime(CLOCK_THREAD_CPUTIME_ID, &(timer->stop));
-#elif defined(HAVE_GETTIMEOFDAY) && defined(__MACH__) && defined(__APPLE__)
+#elif HAVE_GETTIMEOFDAY && defined(__MACH__) && defined(__APPLE__)
mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
thread_basic_info_data_t thi_data;
thread_basic_info_t thi = &thi_data;
thread_info(mach_thread_self(), THREAD_BASIC_INFO, (thread_info_t)thi, &count);
timer->stop.tv_usec = thi->system_time.microseconds + thi->user_time.microseconds;
timer->stop.tv_sec = thi->system_time.seconds + thi->user_time.seconds;
-#elif defined(HAVE_GETTIMEOFDAY)//if nothing else is available, return just time
+#elif HAVE_GETTIMEOFDAY //if nothing else is available, return just time
gettimeofday(&(timer->stop), NULL);
#elif defined(_WIN32)
HANDLE h = GetCurrentThread();
/* 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 "src/portable.h"
+#include "src/internal_config.h"
#include "xbt/misc.h"
#include "xbt/sysdep.h"
#include "xbt/str.h" /* headers of these functions */
#include <mc/mc.h>
#include "mc/datatypes.h"
-#include "src/mc/mc_object_info.h"
#include "src/mc/mc_private.h"
#include "src/mc/Process.hpp"
#include <stdlib.h>
#include "src/mc/mc_private.h"
-#include "src/mc/mc_object_info.h"
#include "src/mc/Process.hpp"
#include "src/mc/Type.hpp"
//teshsuite/simdag/platforms/evaluate_parse_time ../examples/platforms/nancy.xml
#include <stdio.h>
+#include "src/internal_config.h"
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
#include "simgrid/simdag.h"
#include "surf/surf.h"
#include "xbt/xbt_os_time.h"
#include <string.h>
#include <assert.h>
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
*/
#include "mpi.h"
#include "mpitestconf.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <stdio.h>
#include <assert.h>
#include "mpitest.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <assert.h>
#include "mpitest.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <assert.h>
#include "mpitest.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <assert.h>
#include "mpitest.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <assert.h>
#include "mpitest.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <assert.h>
#include "mpitest.h"
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
static int parmap_skip_mode(e_xbt_parmap_mode_t mode)
{
switch (mode) {
-#ifndef HAVE_FUTEX_H
+#if !HAVE_FUTEX_H
case XBT_PARMAP_FUTEX:
printf("not available\n");
return 1;
XBT_INFO("Basic testing posix");
status += test_parmap_basic(XBT_PARMAP_POSIX);
XBT_INFO("Basic testing futex");
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
status += test_parmap_basic(XBT_PARMAP_FUTEX);
#endif
XBT_INFO("Basic testing busy wait");
XBT_INFO("Extended testing posix");
status += test_parmap_extended(XBT_PARMAP_POSIX);
XBT_INFO("Extended testing futex");
-#ifdef HAVE_FUTEX_H
+#if HAVE_FUTEX_H
status += test_parmap_extended(XBT_PARMAP_FUTEX);
#endif
XBT_INFO("Extended testing busy wait");
src/include/surf/maxmin.h
src/include/surf/surf.h
src/msg/msg_private.h
- src/portable.h
src/simdag/dax.dtd
src/simdag/dax_dtd.c
src/simdag/dax_dtd.h
src/mc/mc_unw.h
src/mc/mc_unw.cpp
src/mc/mc_unw_vmread.cpp
- src/mc/mc_object_info.h
src/mc/mc_checkpoint.cpp
src/mc/mc_snapshot.h
src/mc/mc_snapshot.cpp
set(optCFLAGS "")
-
if(enable_compile_warnings)
set(warnCFLAGS "-fno-common -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_JAVA_COMPILE_FLAGS "-Xlint")
endif()
+# Activate the warnings on #if FOOBAR when FOOBAR has no value
+# It breaks on FreeBSD within Boost headers, so activate this only in Pure Hardcore debug mode.
+if(enable_maintainer_mode)
+ set(warnCFLAGS "${warnCFLAGS} -Wundef")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wundef")
+endif()
+
# Se the optimisation flags
# NOTE, we should CMAKE_BUILD_TYPE for this
if(enable_compile_optimizations)
endif()
if(VALGRIND_EXE)
- execute_process(COMMAND "${VALGRIND_EXE} --version " OUTPUT_VARIABLE "VALGRIND_VERSION")
+ execute_process(COMMAND ${VALGRIND_EXE} --version OUTPUT_VARIABLE "VALGRIND_VERSION")
string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" NEW_VALGRIND_VERSION "${VALGRIND_VERSION}")
if(NEW_VALGRIND_VERSION)
message(STATUS "Valgrind version: ${NEW_VALGRIND_VERSION}")
/* 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 "simgrid_config.h" /* what was compiled in? */
+
/* Non-standard header files */
-#cmakedefine HAVE_EXECINFO_H @HAVE_EXECINFO_H@ /* <execinfo.h> */
-#cmakedefine HAVE_FUTEX_H @HAVE_FUTEX_H@ /* <linux/futex.h> */
-#cmakedefine HAVE_SIGNAL_H @HAVE_SIGNAL_H@ /* <signal.h> */
-#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ /* <unistd.h> */
-#cmakedefine HAVE_UCONTEXT_H @HAVE_UCONTEXT_H@ /* <ucontext.h> */
-#cmakedefine HAVE_VALGRIND_H @HAVE_VALGRIND_H@ /* <valgrind/valgrind.h> */
+#define HAVE_EXECINFO_H @HAVE_EXECINFO_H@ /* <execinfo.h> */
+#define HAVE_FUTEX_H @HAVE_FUTEX_H@ /* <linux/futex.h> */
+#define HAVE_SIGNAL_H @HAVE_SIGNAL_H@ /* <signal.h> */
+#define HAVE_UNISTD_H @HAVE_UNISTD_H@ /* <unistd.h> */
+#define HAVE_UCONTEXT_H @HAVE_UCONTEXT_H@ /* <ucontext.h> */
+#define HAVE_VALGRIND_H @HAVE_VALGRIND_H@ /* <valgrind/valgrind.h> */
/* Time portability */
-#cmakedefine HAVE_GETTIMEOFDAY @HAVE_GETTIMEOFDAY@ /* Function gettimeofday */
-#cmakedefine HAVE_POSIX_GETTIME @HAVE_POSIX_GETTIME@ /* Function clock_gettime */
-#cmakedefine HAVE_NANOSLEEP @HAVE_NANOSLEEP@ /* Function nanosleep */
+#define HAVE_GETTIMEOFDAY @HAVE_GETTIMEOFDAY@ /* Function gettimeofday */
+#define HAVE_POSIX_GETTIME @HAVE_POSIX_GETTIME@ /* Function clock_gettime */
+#define HAVE_NANOSLEEP @HAVE_NANOSLEEP@ /* Function nanosleep */
/* The usable context factories */
-#cmakedefine HAVE_BOOST_CONTEXTS @HAVE_BOOST_CONTEXTS@
-#cmakedefine HAVE_RAW_CONTEXTS @HAVE_RAW_CONTEXTS@
-#cmakedefine HAVE_THREAD_CONTEXTS @HAVE_THREAD_CONTEXTS@
-#cmakedefine HAVE_UCONTEXT_CONTEXTS @HAVE_UCONTEXT_CONTEXTS@
+#define HAVE_BOOST_CONTEXTS @HAVE_BOOST_CONTEXTS@
+#define HAVE_RAW_CONTEXTS @HAVE_RAW_CONTEXTS@
+#define HAVE_THREAD_CONTEXTS @HAVE_THREAD_CONTEXTS@
+#define HAVE_UCONTEXT_CONTEXTS @HAVE_UCONTEXT_CONTEXTS@
/* Variables for the thread contexts (and parallel mode of raw contexts) */
-#cmakedefine HAVE_PTHREAD @HAVE_PTHREAD@ /* Define to 1 if threads are usable . */
-#cmakedefine HAVE_PTHREAD_SETAFFINITY @HAVE_PTHREAD_SETAFFINITY@ /* Does not seems defined on Mac nor Windows */
-#cmakedefine HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@ /* If __thread is available */
+#define HAVE_PTHREAD @HAVE_PTHREAD@ /* Define to 1 if threads are usable . */
+#define HAVE_PTHREAD_SETAFFINITY @HAVE_PTHREAD_SETAFFINITY@ /* Does not seems defined on Mac nor Windows */
+#define HAVE_THREAD_LOCAL_STORAGE @HAVE_THREAD_LOCAL_STORAGE@ /* If __thread is available */
/* Variables for the raw contexts (to select the right assembly code) */
-#cmakedefine PROCESSOR_i686 @PROCESSOR_i686@
-#cmakedefine PROCESSOR_x86_64 @PROCESSOR_x86_64@
-#cmakedefine CMAKE_SYSTEM_PROCESSOR @CMAKE_SYSTEM_PROCESSOR@
+#define SIMGRID_PROCESSOR_i686 @PROCESSOR_i686@
+#define SIMGRID_PROCESSOR_x86_64 @PROCESSOR_x86_64@
/* Variables for the SysV contexts */
@sg_makecontext_stack_addr@
#cmakedefine PTH_STACKGROWTH @PTH_STACKGROWTH@ /* Does the stack growth upward, or downward? */
/* MC variables */
-#cmakedefine HAVE_GETDTABLESIZE @HAVE_GETDTABLESIZE@ /* getdtablesize: get descriptor table size */
-#cmakedefine HAVE_MMALLOC @HAVE_MMALLOC@ /* Did we compile mmalloc in? */
-#cmakedefine HAVE_PROCESS_VM_READV @HAVE_PROCESS_VM_READV@ /* process_vm_readv: transfer data between process address spaces */
-#cmakedefine HAVE_MC @HAVE_MC@ /* Set to true if enable_model-checking is true and the dependencies available */
+#define HAVE_GETDTABLESIZE @HAVE_GETDTABLESIZE@ /* getdtablesize: get descriptor table size */
+#define HAVE_MMALLOC @HAVE_MMALLOC@ /* Did we compile mmalloc in? */
+#define HAVE_PROCESS_VM_READV @HAVE_PROCESS_VM_READV@ /* process_vm_readv: transfer data between process address spaces */
+#define HAVE_MC @HAVE_MC@ /* Set to true if enable_model-checking is true and the dependencies available */
/* SMPI variables */
-#cmakedefine HAVE_SMPI @HAVE_SMPI@
-#cmakedefine SMPI_FORTRAN @SMPI_FORTRAN@
-#cmakedefine HAVE_PRIVATIZATION @HAVE_PRIVATIZATION@ /* We have mmap and objdump to handle privatization */
+#define HAVE_SMPI @HAVE_SMPI@
+#define SMPI_FORTRAN @SMPI_FORTRAN@
+#define HAVE_PRIVATIZATION @HAVE_PRIVATIZATION@ /* We have mmap and objdump to handle privatization */
/* Other function checks */
-#cmakedefine HAVE_MMAP @HAVE_MMAP@ /* Function mmap */
-#cmakedefine HAVE_SEM_INIT @HAVE_SEM_INIT@ /* Function sem_init (part of XPG6 standard only) */
-#cmakedefine HAVE_POPEN @HAVE_POPEN@ /* Function popen */
-#cmakedefine HAVE_SYSCONF @HAVE_SYSCONF@ /* Function sysconf */
-#cmakedefine HAVE_VASPRINTF @HAVE_VASPRINTF@ /* Function vasprintf */
+#define HAVE_MMAP @HAVE_MMAP@ /* Function mmap */
+#define HAVE_SEM_INIT @HAVE_SEM_INIT@ /* Function sem_init (part of XPG6 standard only) */
+#define HAVE_POPEN @HAVE_POPEN@ /* Function popen */
+#define HAVE_SYSCONF @HAVE_SYSCONF@ /* Function sysconf */
+#define HAVE_VASPRINTF @HAVE_VASPRINTF@ /* Function vasprintf */
/* Other checks */
#cmakedefine ADDR2LINE "@ADDR2LINE@" /* Path to the addr2line tool */
-#cmakedefine HAVE_GRAPHVIZ @HAVE_GRAPHVIZ@ /* The graphviz library */
+#define HAVE_GRAPHVIZ @HAVE_GRAPHVIZ@ /* The graphviz library */
