move core/process into util/process

this prepares for the implementation of child process resource tracking

10 files changed, 9 insertions, 9 deletions

diff --git a/src/zen/cmds/bench_cmd.cpp b/src/zen/cmds/bench_cmd.cpp
index 5c955e980..d8c9e12d6 100644
--- a/src/zen/cmds/bench_cmd.cpp
+++ b/src/zen/cmds/bench_cmd.cpp
@@ -7,10 +7,10 @@
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
-#include <zencore/process.h>
 #include <zencore/string.h>
 #include <zencore/thread.h>
 #include <zencore/timer.h>
+#include <zenutil/process.h>
 
 namespace zen {
 
diff --git a/src/zen/cmds/rpcreplay_cmd.cpp b/src/zen/cmds/rpcreplay_cmd.cpp
index 202829aa0..409d3393e 100644
--- a/src/zen/cmds/rpcreplay_cmd.cpp
+++ b/src/zen/cmds/rpcreplay_cmd.cpp
@@ -6,7 +6,6 @@
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
-#include <zencore/process.h>
 #include <zencore/scopeguard.h>
 #include <zencore/session.h>
 #include <zencore/stream.h>
@@ -15,6 +14,7 @@
 #include <zenhttp/httpcommon.h>
 #include <zenhttp/httpshared.h>
 #include <zenutil/cache/rpcrecording.h>
+#include <zenutil/process.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <cpr/cpr.h>
diff --git a/src/zen/cmds/run_cmd.cpp b/src/zen/cmds/run_cmd.cpp
index a99ba9704..f576deeaf 100644
--- a/src/zen/cmds/run_cmd.cpp
+++ b/src/zen/cmds/run_cmd.cpp
@@ -5,9 +5,9 @@
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
-#include <zencore/process.h>
 #include <zencore/string.h>
 #include <zencore/timer.h>
+#include <zenutil/process.h>
 
 using namespace std::literals;
 
diff --git a/src/zen/cmds/up_cmd.cpp b/src/zen/cmds/up_cmd.cpp
index 837cc7edf..7a21a35b1 100644
--- a/src/zen/cmds/up_cmd.cpp
+++ b/src/zen/cmds/up_cmd.cpp
@@ -4,7 +4,7 @@
 
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
-#include <zencore/process.h>
+#include <zenutil/process.h>
 #include <zenutil/zenserverprocess.h>
 
 #include <memory>
diff --git a/src/zencore/filesystem.cpp b/src/zencore/filesystem.cpp
index e9b147be5..4d46cd910 100644
--- a/src/zencore/filesystem.cpp
+++ b/src/zencore/filesystem.cpp
@@ -7,7 +7,6 @@
 #include <zencore/fmtutils.h>
 #include <zencore/iobuffer.h>
 #include <zencore/logging.h>
-#include <zencore/process.h>
 #include <zencore/stream.h>
 #include <zencore/string.h>
 #include <zencore/testing.h>
diff --git a/src/zencore/zencore.cpp b/src/zencore/zencore.cpp
index eed903f54..3b938a6ef 100644
--- a/src/zencore/zencore.cpp
+++ b/src/zencore/zencore.cpp
@@ -25,7 +25,6 @@
 #include <zencore/logging.h>
 #include <zencore/memory.h>
 #include <zencore/mpscqueue.h>
-#include <zencore/process.h>
 #include <zencore/sha1.h>
 #include <zencore/stats.h>
 #include <zencore/stream.h>
@@ -141,7 +140,6 @@ zencore_forcelinktests()
 	zen::logging_forcelink();
 	zen::memory_forcelink();
 	zen::mpscqueue_forcelink();
-	zen::process_forcelink();
 	zen::refcount_forcelink();
 	zen::sha1_forcelink();
 	zen::stats_forcelink();
diff --git a/src/zencore/include/zencore/process.h b/src/zenutil/include/zenutil/process.h
index d90a32301..429ab113a 100644
--- a/src/zencore/include/zencore/process.h
+++ b/src/zenutil/include/zenutil/process.h
@@ -53,6 +53,7 @@ struct CreateProcOptions
 	const std::filesystem::path* WorkingDirectory = nullptr;
 	uint32_t					 Flags			  = 0;
 	std::filesystem::path		 StdoutFile;
+	bool						 WithTracking = false;
 };
 
 #if ZEN_PLATFORM_WINDOWS
diff --git a/src/zenutil/include/zenutil/zenserverprocess.h b/src/zenutil/include/zenutil/zenserverprocess.h
index 15138341c..6af48c33d 100644
--- a/src/zenutil/include/zenutil/zenserverprocess.h
+++ b/src/zenutil/include/zenutil/zenserverprocess.h
@@ -4,9 +4,9 @@
 
 #include <zencore/enumflags.h>
 #include <zencore/logging.h>
-#include <zencore/process.h>
 #include <zencore/thread.h>
 #include <zencore/uid.h>
+#include <zenutil/process.h>
 
 #include <atomic>
 #include <filesystem>
diff --git a/src/zencore/process.cpp b/src/zenutil/process.cpp
index 2d0ec2de6..afdd9b338 100644
--- a/src/zencore/process.cpp
+++ b/src/zenutil/process.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <zencore/process.h>
+#include <zenutil/process.h>
 
 #include <zencore/except.h>
 #include <zencore/filesystem.h>
diff --git a/src/zenutil/zenutil.cpp b/src/zenutil/zenutil.cpp
index df075ea3f..00db5a25b 100644
--- a/src/zenutil/zenutil.cpp
+++ b/src/zenutil/zenutil.cpp
@@ -5,6 +5,7 @@
 #if ZEN_WITH_TESTS
 
 #	include <zenutil/basicfile.h>
+#	include <zenutil/process.h>
 
 namespace zen {
 
@@ -12,6 +13,7 @@ void
 zenutil_forcelinktests()
 {
 	basicfile_forcelink();
+	process_forcelink();
 }
 
 }  // namespace zen