Implement a better naming convention for sub-crates

reverie-rs · Aug 27, 2019 · 76dddf6 · 76dddf6
1 parent 24d39f9
commit 76dddf6
Show file tree

Hide file tree

Showing 74 changed files with 2,334 additions and 223 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,37 +1,3 @@
-[package]
-name = "reverie"
-version = "0.1.0"
-authors = ["Baojun Wang <wangbj@gmail.com>"]
-edition = "2018"
-
 [workspace]
-members= [".", "syscalls", "tools_helper", "common", "preloader", "examples/none", "examples/echo", "examples/counter", "examples/det" ]
-default-members = [".", "syscalls", "common", "preloader" ]
-
-[lib]
-name = "reverie"
-path = "src/lib.rs"
-
-[[bin]]
-name = "reverie"
-path = "src/main.rs"
-
-[dependencies]
-libc = { version = "0.2", default-features = false }
-syscalls = { path = "syscalls" }
-common = { path = "common" }
-nix = "0.13"
-goblin = "0.0"
-procfs = "0.5"
-clap = "2.32"
-lazy_static = "1.3"
-colored = "1.7"
-chrono = "0.4"
-log = "0.4"
-fern = "0.5"
-serde = { version = "1.0", features = [ "derive" ] }
-serde_json = "1.0"
-
-[build-dependencies]
-cc = "1.0"
-sysnum = { path = "sysnum" }
+members= ["reverie", "reverie-syscalls", "reverie-tools-helper", "reverie-common", "reverie-preloader", "examples/none", "examples/echo", "examples/counter", "examples/det" ]
+default-members = ["reverie", "reverie-syscalls", "reverie-common", "reverie-preloader" ]
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ all:
 	$(MAKE) -C tests all
 	@cargo build $(WAY) --all
 	@cargo build --manifest-path examples/echo/Cargo.toml --target-dir=target
-	@cp -v target/$(TARGETDIR)/libpreloader.so lib/
+	@cp -v target/$(TARGETDIR)/libreverie_preloader.so lib/
 	@cp -v target/$(TARGETDIR)/libecho.so lib/
 	@cp -v target/$(TARGETDIR)/libnone.so lib/
 	@cp -v target/$(TARGETDIR)/libcounter.so lib/

diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml
@@ -10,8 +10,7 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-syscalls = { path = "../../syscalls" }
-tools_helper = { path = "../../tools_helper" }
+reverie-tools-helper = { path = "../../reverie-tools-helper" }
 log = { version = "0.4", default-features = false }
 
 [build-dependencies]

diff --git a/examples/counter/src/lib.rs b/examples/counter/src/lib.rs
@@ -6,8 +6,7 @@
 #[allow(unused_imports)]
 use std::ffi::CStr;
 
-use tools_helper::*;
-use syscalls::*;
+use reverie_tools_helper::{ syscalls::*, counter::*, common::local_state::ProcessState, logger };
 
 #[cfg_attr(target_os = "linux", link_section = ".ctors")]
 #[used]

diff --git a/examples/det/Cargo.toml b/examples/det/Cargo.toml
@@ -10,8 +10,7 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-syscalls = { path = "../../syscalls" }
-tools_helper = { path = "../../tools_helper" }
+reverie-tools-helper = { path = "../../reverie-tools-helper" }
 log = { version = "0.4", default-features = false }
 libc = { version = "0.2", default-features = false }
 

diff --git a/examples/det/src/lib.rs b/examples/det/src/lib.rs
@@ -2,8 +2,7 @@
 #![allow(unused_imports)]
 #![allow(unused_attributes)]
 
-use tools_helper::*;
-use syscalls::*;
+use reverie_tools_helper::{syscalls::*, counter::*, common::local_state::ProcessState, logger};
 use log::*;
 
 #[allow(unused_imports)]
@@ -38,10 +37,10 @@ pub extern "C" fn captured_syscall(
     a5: i64,
 ) -> i64 {
     note_syscall(p, no, NoteInfo::SyscallEntry);
-    let sc = syscalls::SyscallNo::from(no);
+    let sc = SyscallNo::from(no);
     #[allow(unused_assignments)]
     let mut res = -38; // ENOSYS
-    
+
     match sc {
         SYS_gettimeofday => {
             let tick = LOGICAL_TIME.fetch_add(1, Ordering::SeqCst) as i64;

diff --git a/examples/echo/Cargo.toml b/examples/echo/Cargo.toml
@@ -10,8 +10,7 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-syscalls = { path = "../../syscalls" }
-tools_helper = { path = "../../tools_helper" }
+reverie-tools-helper = { path = "../../reverie-tools-helper" }
 log = { version = "0.4", default-features = false }
 serde = { version = "1.0", default-features = false, features = [ "derive" ] }
 libc = { version = "0.2", default-features = false, features = [] }

diff --git a/examples/echo/src/dpc.rs b/examples/echo/src/dpc.rs
@@ -1,12 +1,9 @@
 //! deferred precedure calls
 //!
 
-use syscalls::syscall;
+use reverie_tools_helper::{ common::consts, syscalls::syscall, logger} ;
 use log::debug;
 
-use tools_helper::common::consts;
-use tools_helper::logger;
-
 const DPC_PREFIX: &'static str = "/tmp/dpc-task.";
 
 const PF_UNIX: i32 = 1;

diff --git a/examples/echo/src/entry.rs b/examples/echo/src/entry.rs
@@ -1,11 +1,13 @@
 //! echo entrypoint who defines `captured_syscall`
 //!
-use syscalls::*;
-use tools_helper::*;
 
 use crate::show::*;
-use tools_helper::counter::{note_syscall, NoteInfo};
-use tools_helper::common::local_state::{ProcessState, ThreadState};
+use reverie_tools_helper::syscalls::*;
+use reverie_tools_helper::counter::{note_syscall, NoteInfo};
+use reverie_tools_helper::common::local_state::{ProcessState, ThreadState};
+
+use reverie_tools_helper::logger::*;
+use reverie_tools_helper::*;
 
 #[macro_export(smsg)]
 macro_rules! smsg {
@@ -32,7 +34,7 @@ pub extern "C" fn captured_syscall(
     a4: i64,
     a5: i64,
 ) -> i64 {
-    let sc = syscalls::SyscallNo::from(no);
+    let sc = SyscallNo::from(no);
     note_syscall(p, no, NoteInfo::SyscallEntry);
 
     let tid = syscall!(SYS_gettid).unwrap();

diff --git a/examples/echo/src/lib.rs b/examples/echo/src/lib.rs
@@ -1,7 +1,7 @@
 #![feature(format_args_nl, slice_internals)]
 #![allow(unused_attributes)]
 
-use tools_helper::*;
+use reverie_tools_helper::{counter, common, logger};
 
 #[macro_use]
 pub mod macros;

diff --git a/examples/echo/src/show/args.rs b/examples/echo/src/show/args.rs
@@ -1,5 +1,5 @@
 //! pretty print syscalls
-use syscalls::*;
+use reverie_tools_helper::syscalls::*;
 use core::fmt;
 use core::fmt::Display;
 use core::ptr::NonNull;
@@ -891,7 +891,7 @@ impl Display for kernel_sigaction {
                self.sa_mask,
                {
                    let flags = self.sa_flags as i32;
-                   let mut v: Vec<_> = 
+                   let mut v: Vec<_> =
                    [ libc_bit_field!(flags, SA_NOCLDSTOP),
                      libc_bit_field!(flags, SA_NOCLDWAIT),
                      libc_bit_field!(flags, SA_SIGINFO),

diff --git a/examples/echo/src/show/types.rs b/examples/echo/src/show/types.rs
@@ -1,7 +1,7 @@
 
 use core::ptr::NonNull;
 use core::ffi::c_void as void;
-use syscalls::SyscallNo;
+use reverie_tools_helper::syscalls::SyscallNo;
 
 /// syscall return vaules for formatting purpose
 #[derive(Clone, Copy)]

diff --git a/examples/none/Cargo.toml b/examples/none/Cargo.toml
@@ -10,8 +10,7 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-syscalls = { path = "../../syscalls" }
-tools_helper = { path = "../../tools_helper" }
+reverie-tools-helper = { path = "../../reverie-tools-helper" }
 serde = { version = "1.0", default-features = false, features = [ "derive" ] }
 
 [build-dependencies]

diff --git a/examples/none/src/lib.rs b/examples/none/src/lib.rs
@@ -1,8 +1,7 @@
 #![allow(unused_imports)]
 #![allow(unused_attributes)]
 
-use syscalls::*;
-use tools_helper::*;
+use reverie_tools_helper::{ syscalls::*, common::local_state::ProcessState };
 
 #[no_mangle]
 pub extern "C" fn captured_syscall(

diff --git a/include/systrace.h b/include/systrace.h
diff --git a/common/Cargo.toml → reverie-common/Cargo.toml b/common/Cargo.toml → reverie-common/Cargo.toml
@@ -1,11 +1,15 @@
 [package]
-name = "common"
+name = "reverie-common"
 version = "0.1.0"
 authors = ["Logan Wendholt <lwendholt@gmail.com>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lib]
+name = "reverie_common"
+path = "src/lib.rs"
+
 [dependencies]
 nix = "0.13"
 lazy_static = "1.3"
diff --git a/common/src/consts.rs → reverie-common/src/consts.rs b/common/src/consts.rs → reverie-common/src/consts.rs
diff --git a/common/src/lib.rs → reverie-common/src/lib.rs b/common/src/lib.rs → reverie-common/src/lib.rs
diff --git a/common/src/local_state.rs → reverie-common/src/local_state.rs b/common/src/local_state.rs → reverie-common/src/local_state.rs
diff --git a/common/src/profiling.rs → reverie-common/src/profiling.rs b/common/src/profiling.rs → reverie-common/src/profiling.rs
diff --git a/common/src/state.rs → reverie-common/src/state.rs b/common/src/state.rs → reverie-common/src/state.rs
diff --git a/preloader/Cargo.toml → reverie-preloader/Cargo.toml b/preloader/Cargo.toml → reverie-preloader/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
-name = "preloader"
+name = "reverie-preloader"
 version = "0.1.0"
 authors = ["Baojun Wang <wangbj@gmail.com>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
-name = "preloader"
+name = "reverie_preloader"
 crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-syscalls = { path = "../syscalls" }
-common = { path = "../common" }
+reverie-syscalls = { path = "../reverie-syscalls" }
+reverie-common = { path = "../reverie-common" }
 procfs = "0.5"
 nix = "0.14"
 libc = "0.2"

diff --git a/preloader/build.rs → reverie-preloader/build.rs b/preloader/build.rs → reverie-preloader/build.rs
diff --git a/preloader/src/bpf-helper.c → reverie-preloader/src/bpf-helper.c b/preloader/src/bpf-helper.c → reverie-preloader/src/bpf-helper.c
diff --git a/preloader/src/bpf-helper.h → reverie-preloader/src/bpf-helper.h b/preloader/src/bpf-helper.h → reverie-preloader/src/bpf-helper.h
diff --git a/preloader/src/bpf_ll.c → reverie-preloader/src/bpf_ll.c b/preloader/src/bpf_ll.c → reverie-preloader/src/bpf_ll.c
diff --git a/preloader/src/bpf_ll.h → reverie-preloader/src/bpf_ll.h b/preloader/src/bpf_ll.h → reverie-preloader/src/bpf_ll.h
diff --git a/preloader/src/dl_ns.c → reverie-preloader/src/dl_ns.c b/preloader/src/dl_ns.c → reverie-preloader/src/dl_ns.c
diff --git a/preloader/src/lib.rs → reverie-preloader/src/lib.rs b/preloader/src/lib.rs → reverie-preloader/src/lib.rs
@@ -5,8 +5,8 @@ use std::io::Result;
 pub mod relink;
 pub mod seccomp_bpf;
 
-use syscalls::*;
-use common::consts;
+use reverie_syscalls::*;
+use reverie_common::consts;
 
 #[link_section = ".init_array"]
 #[used]

diff --git a/preloader/src/relink.rs → reverie-preloader/src/relink.rs b/preloader/src/relink.rs → reverie-preloader/src/relink.rs
diff --git a/preloader/src/seccomp_bpf.rs → reverie-preloader/src/seccomp_bpf.rs b/preloader/src/seccomp_bpf.rs → reverie-preloader/src/seccomp_bpf.rs
diff --git a/syscalls/Cargo.toml → reverie-syscalls/Cargo.toml b/syscalls/Cargo.toml → reverie-syscalls/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
-name = "syscalls"
+name = "reverie-syscalls"
 version = "0.1.0"
 authors = ["Baojun Wang <wangbj@gmail.com>"]
 edition = "2018"
 
 [lib]
-name = "syscalls"
+name = "reverie_syscalls"
 path = "src/lib.rs"
 
 [dependencies]
 
 [build-dependencies]
-sysnum = { path = "../sysnum" }
+reverie-sysnum = { path = "../reverie-sysnum" }
diff --git a/syscalls/build.rs → reverie-syscalls/build.rs b/syscalls/build.rs → reverie-syscalls/build.rs
@@ -1,7 +1,7 @@
 use std::fs::File;
 use std::io::{Result, Write};
 use std::path::PathBuf;
-use sysnum::gen_syscalls;
+use reverie_sysnum::gen_syscalls;
 
 fn gen_syscall_nrs(dest: PathBuf) -> Result<()> {
     let mut f = File::create(dest)?;

diff --git a/syscalls/src/helper.rs → reverie-syscalls/src/helper.rs b/syscalls/src/helper.rs → reverie-syscalls/src/helper.rs
diff --git a/syscalls/src/lib.rs → reverie-syscalls/src/lib.rs b/syscalls/src/lib.rs → reverie-syscalls/src/lib.rs
diff --git a/syscalls/src/macros.rs → reverie-syscalls/src/macros.rs b/syscalls/src/macros.rs → reverie-syscalls/src/macros.rs