X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdaff2753e3c9371e8122ffaf0694581b458d80d..f8c51e91f402a7b7bbe72fb61af59ddaad7d5cf8:/src/kernel/activity/ActivityImpl.hpp diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp index d145e8fb36..7b8f091a81 100644 --- a/src/kernel/activity/ActivityImpl.hpp +++ b/src/kernel/activity/ActivityImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ @@ -13,6 +13,7 @@ #include "simgrid/forward.h" #include +#include #include namespace simgrid { @@ -21,16 +22,20 @@ namespace activity { class XBT_PUBLIC ActivityImpl { public: - ActivityImpl(); - virtual ~ActivityImpl(); + ActivityImpl() = default; + explicit ActivityImpl(std::string name) : name_(name) {} + virtual ~ActivityImpl() = default; e_smx_state_t state_ = SIMIX_WAITING; /* State of the activity */ std::string name_; /* Activity name if any */ std::list simcalls_; /* List of simcalls waiting for this activity */ + resource::Action* surf_action_ = nullptr; virtual void suspend() = 0; virtual void resume() = 0; virtual void post() = 0; // What to do when a simcall terminates + void set_category(std::string category); + // boost::intrusive_ptr support: friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity); friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);