Merge pull request #2615 from nab880/devel

Seperated sleep calls into skeleton.cc file instead of included in sk…

Author: jpkenny

src/sst/elements/mask-mpi/skeletons/halo3d-26.cc

@@ -44,6 +44,8 @@ Questions? Contact [email protected]
 
 #include <mask_mpi.h>
 #include <mercury/common/skeleton.h>
+#include <cstdlib>
+#include <ctime>
 //#include <sstmac/replacements/sys/time.h>
 //#include <sstmac/replacements/time.h>
 

src/sst/elements/mercury/Makefile.am

@@ -25,6 +25,7 @@ libhg_la_SOURCES = \
   common/util.cc \
   common/timestamp.cc \
   common/connection.cc \
+  common/skeleton.cc \
   components/compute_library/node_cl.cc \
   components/compute_library/operating_system_cl.cc \
   components/compute_library/operating_system_cl_api.cc \

src/sst/elements/mercury/common/skeleton.cc

@@ -0,0 +1,55 @@
+// Copyright 2009-2025 NTESS. Under the terms
+// of Contract DE-NA0003525 with NTESS, the U.S.
+// Government retains certain rights in this software.
+//
+// Copyright (c) 2009-2025, NTESS
+// All rights reserved.
+//
+// Portions are copyright of other developers:
+// See the file CONTRIBUTORS.TXT in the top level directory
+// of the distribution for more information.
+//
+// This file is part of the SST software package. For license
+// information, see the LICENSE file in the top level directory of the
+// distribution.
+
+//#include <mercury/common/skeleton.h>
+#include <mercury/common/timestamp.h>
+#include <mercury/operating_system/libraries/unblock_event.h>
+#include <mercury/components/operating_system_api.h>
+#include <mercury/components/operating_system_impl.h>
+
+namespace SST::Hg {
+
+unsigned int
+ssthg_sleep(unsigned int secs) {
+    OperatingSystemAPI* cos = OperatingSystemImpl::currentOs();
+    Thread* t = cos->activeThread();
+    UnblockEvent* ev = new UnblockEvent(cos, t);
+    cos->sendDelayedExecutionEvent(TimeDelta(secs, TimeDelta::one_second), ev);
+    cos->block();
+    return 0;
+}
+
+unsigned int
+ssthg_usleep(unsigned int usecs) {
+    OperatingSystemAPI* cos = OperatingSystemImpl::currentOs();
+    Thread* t = cos->activeThread();
+    UnblockEvent* ev = new UnblockEvent(cos, t);
+    cos->sendDelayedExecutionEvent(TimeDelta(usecs, TimeDelta::one_microsecond), ev);
+    cos->block();
+    return 0;
+}
+
+unsigned int
+ssthg_nanosleep(unsigned int nsecs) {
+    OperatingSystemAPI* cos = OperatingSystemImpl::currentOs();
+    Thread* t = cos->activeThread();
+    UnblockEvent* ev = new UnblockEvent(cos, t);
+    cos->sendDelayedExecutionEvent(TimeDelta(nsecs, TimeDelta::one_nanosecond), ev);
+    cos->block();
+    return 0;
+}
+
+} //end namespace SST::Hg
+

src/sst/elements/mercury/common/skeleton.h

@@ -18,10 +18,6 @@
 
 #pragma once
 
-#include <mercury/operating_system/libraries/unblock_event.h>
-#include <mercury/components/operating_system_api.h>
-#include <mercury/components/operating_system_impl.h>
-
 #define SSTPP_QUOTE(name) #name
 #define SSTPP_STR(name) SSTPP_QUOTE(name)
 
@@ -84,35 +80,9 @@ void sst_hg_blocking_call(int condition, double timeout, const char* api);
 
 namespace SST::Hg {
 
-unsigned int
-ssthg_sleep(unsigned int secs) {
-    OperatingSystemAPI* cos = OperatingSystemImpl::currentOs();
-    Thread* t = cos->activeThread();
-    UnblockEvent* ev = new UnblockEvent(cos, t);
-    cos->sendDelayedExecutionEvent(TimeDelta(secs, TimeDelta::one_second), ev);
-    cos->block();
-    return 0;
-}
-
-unsigned int
-ssthg_usleep(unsigned int usecs) {
-    OperatingSystemAPI* cos = OperatingSystemImpl::currentOs();
-    Thread* t = cos->activeThread();
-    UnblockEvent* ev = new UnblockEvent(cos, t);
-    cos->sendDelayedExecutionEvent(TimeDelta(usecs, TimeDelta::one_microsecond), ev);
-    cos->block();
-    return 0;
-}
-
-unsigned int
-ssthg_nanosleep(unsigned int nsecs) {
-    OperatingSystemAPI* cos = OperatingSystemImpl::currentOs();
-    Thread* t = cos->activeThread();
-    UnblockEvent* ev = new UnblockEvent(cos, t);
-    cos->sendDelayedExecutionEvent(TimeDelta(nsecs, TimeDelta::one_nanosecond), ev);
-    cos->block();
-    return 0;
-}
+unsigned int ssthg_sleep(unsigned int secs);
+unsigned int ssthg_usleep(unsigned int usecs);
+unsigned int ssthg_nanosleep(unsigned int nsecs);
 
 } //end namespace SST::Hg