enable alternative log, config and bin path

Signed-off-by: Tianhao Wang <[email protected]>

Author: shrik3

qvisor/Cargo.lock

@@ -58,6 +58,7 @@ rcublas-sys = { version = "0.5.0", optional = true }
 cuda11-cublasLt-sys = { version = "0.3.0", optional = true }
 libelf = { version = "0.1.0", optional = true }
 io-uring = "0.6.3"
+const_format = "0.2.32"
 
 [features]
 cuda = ["cuda-driver-sys", "cuda-runtime-sys", "libelf", "rcublas-sys", "cuda11-cublasLt-sys"]

qvisor/Cargo.toml

@@ -5,9 +5,7 @@
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
@@ -61,6 +59,8 @@ extern crate regex;
 extern crate simplelog;
 extern crate spin;
 extern crate tabwriter;
+#[macro_use]
+extern crate const_format;
 
 #[macro_use]
 pub mod print;
@@ -169,8 +169,6 @@ lazy_static! {
     );
 }
 
-pub const LOG_FILE: &'static str = "/var/log/quark/quark.log";
-
 pub fn InitSingleton() {
     self::qlib::InitSingleton();
 }

qvisor/src/main.rs

@@ -43,9 +43,14 @@ pub fn SetSyncPrint(syncPrint: bool) {
     LOG.SetSyncPrint(syncPrint);
 }
 
-pub const LOG_FILE_DEFAULT: &str = "/var/log/quark/quark.log";
-pub const RAWLOG_FILE_DEFAULT: &str = "/var/log/quark/raw.log";
-pub const LOG_FILE_FORMAT: &str = "/var/log/quark/{}.log";
+
+pub const LOG_DIR: &str = match option_env!("QLOG_DIR") {
+    Some(s) => s,
+    None => "/var/log/quark"
+};
+pub const LOG_FILE_DEFAULT: &str = concatcp!(LOG_DIR, "/quark.log");
+pub const RAWLOG_FILE_DEFAULT: &str = concatcp!(LOG_DIR, "/raw.log");
+pub const LOG_FILE_FORMAT: &str = concatcp!(LOG_DIR, "/{}.log");
 pub const TIME_FORMAT: &str = "%H:%M:%S%.3f";
 
 pub const MEMORY_LEAK_LOG: bool = false;

qvisor/src/print.rs

@@ -76,7 +76,11 @@ impl CmdCmd {
 }
 
 impl Config {
-    pub const CONFIG_FILE: &'static str = "/etc/quark/config.json";
+    pub const CONFIG_DIR: &'static str = match option_env!("QCONFIG_DIR") {
+        Some(s) => s,
+        None => "/etc/quark"
+    };
+    pub const CONFIG_FILE: &'static str = concatcp!(Config::CONFIG_DIR, "/config.json");
 
     // if the config file exist, load file and return true; otherwise return false
     pub fn Load(&mut self) -> bool {

qvisor/src/runc/cmd/cmd.rs

@@ -166,13 +166,15 @@ impl VirtualMachine {
         );
     }
 
+    pub const QUARK_BIN_DIR: &'static str = match option_env!("QBIN_DIR") {
+        Some(s) => s,
+        None => "/usr/local/bin"
+    };
+    pub const VDSO_PATH: &'static str = concatcp!(VirtualMachine::QUARK_BIN_DIR, "/vdso.so");
     #[cfg(debug_assertions)]
-    pub const KERNEL_IMAGE: &'static str = "/usr/local/bin/qkernel_d.bin";
-
+    pub const KERNEL_IMAGE: &'static str = concatcp!(VirtualMachine::QUARK_BIN_DIR, "/qkernel_d.bin");
     #[cfg(not(debug_assertions))]
-    pub const KERNEL_IMAGE: &'static str = "/usr/local/bin/qkernel.bin";
-
-    pub const VDSO_PATH: &'static str = "/usr/local/bin/vdso.so";
+    pub const KERNEL_IMAGE: &'static str = concatcp!(VirtualMachine::QUARK_BIN_DIR, "/qkernel.bin");
 
     pub fn InitShareSpace(
         cpuCount: usize,