Rename subcrates

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

Hide file tree

Showing 41 changed files with 80 additions and 1,149 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,3 +1,3 @@
 [workspace]
-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" ]
+members= ["reverie", "syscalls", "reverie-helper", "reverie-common", "reverie-preloader", "examples/none", "examples/echo", "examples/counter", "examples/det" ]
+default-members = ["reverie", "syscalls", "reverie-common", "reverie-preloader" ]
diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-reverie-tools-helper = { path = "../../reverie-tools-helper" }
+reverie-helper = { path = "../../reverie-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,7 +6,7 @@
 #[allow(unused_imports)]
 use std::ffi::CStr;
 
-use reverie_tools_helper::{ syscalls::*, counter::*, common::local_state::ProcessState, logger };
+use reverie_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,7 +10,7 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-reverie-tools-helper = { path = "../../reverie-tools-helper" }
+reverie-helper = { path = "../../reverie-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,7 +2,7 @@
 #![allow(unused_imports)]
 #![allow(unused_attributes)]
 
-use reverie_tools_helper::{syscalls::*, counter::*, common::local_state::ProcessState, logger};
+use reverie_helper::{syscalls::*, counter::*, common::local_state::ProcessState, logger};
 use log::*;
 
 #[allow(unused_imports)]

diff --git a/examples/echo/Cargo.toml b/examples/echo/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-reverie-tools-helper = { path = "../../reverie-tools-helper" }
+reverie-helper = { path = "../../reverie-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,7 +1,7 @@
 //! deferred precedure calls
 //!
 
-use reverie_tools_helper::{ common::consts, syscalls::syscall, logger} ;
+use reverie_helper::{ common::consts, syscalls::syscall, logger} ;
 use log::debug;
 
 const DPC_PREFIX: &'static str = "/tmp/dpc-task.";

diff --git a/examples/echo/src/entry.rs b/examples/echo/src/entry.rs
@@ -2,12 +2,12 @@
 //!
 
 use crate::show::*;
-use reverie_tools_helper::syscalls::*;
-use reverie_tools_helper::counter::{note_syscall, NoteInfo};
-use reverie_tools_helper::common::local_state::{ProcessState, ThreadState};
+use reverie_helper::syscalls::*;
+use reverie_helper::counter::{note_syscall, NoteInfo};
+use reverie_helper::common::local_state::{ProcessState, ThreadState};
 
-use reverie_tools_helper::logger::*;
-use reverie_tools_helper::*;
+use reverie_helper::logger::*;
+use reverie_helper::*;
 
 #[macro_export(smsg)]
 macro_rules! smsg {

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 reverie_tools_helper::{counter, common, logger};
+use reverie_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 reverie_tools_helper::syscalls::*;
+use reverie_helper::syscalls::*;
 use core::fmt;
 use core::fmt::Display;
 use core::ptr::NonNull;

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 reverie_tools_helper::syscalls::SyscallNo;
+use reverie_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,7 +10,7 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-reverie-tools-helper = { path = "../../reverie-tools-helper" }
+reverie-helper = { path = "../../reverie-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,7 +1,7 @@
 #![allow(unused_imports)]
 #![allow(unused_attributes)]
 
-use reverie_tools_helper::{ syscalls::*, common::local_state::ProcessState };
+use reverie_helper::{ syscalls::*, common::local_state::ProcessState };
 
 #[no_mangle]
 pub extern "C" fn captured_syscall(

diff --git a/reverie-common/src/lib.rs b/reverie-common/src/lib.rs
@@ -1,4 +1,4 @@
-//! reverie tools helper
+//! reverie common
 //!
 
 #![feature(format_args_nl, slice_internals)]
@@ -10,4 +10,3 @@ pub mod consts;
 pub mod state;
 pub mod local_state;
 pub mod profiling;
-
diff --git a/reverie-tools-helper/Cargo.toml → reverie-helper/Cargo.toml b/reverie-tools-helper/Cargo.toml → reverie-helper/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
-name = "reverie-tools-helper"
+name = "reverie-helper"
 version = "0.1.0"
 authors = ["Baojun Wang <wangbj@gmail.com>"]
 edition = "2018"
 
 [lib]
-name = "reverie_tools_helper"
+name = "reverie_helper"
 crate-type = ["lib"]
 
 [features]
 std = []
 
 [dependencies]
-reverie-syscalls = { path = "../reverie-syscalls" }
+syscalls = { path = "../syscalls" }
 reverie-common = { path = "../reverie-common" }
 log = { version = "0.4", default-features = false }
 serde = { version = "1.0", default-features = false, features = [ "derive" ] }

diff --git a/reverie-tools-helper/build.rs → reverie-helper/build.rs b/reverie-tools-helper/build.rs → reverie-helper/build.rs
diff --git a/reverie-tools-helper/src/counter.rs → reverie-helper/src/counter.rs b/reverie-tools-helper/src/counter.rs → reverie-helper/src/counter.rs
diff --git a/reverie-tools-helper/src/ffi.rs → reverie-helper/src/ffi.rs b/reverie-tools-helper/src/ffi.rs → reverie-helper/src/ffi.rs
@@ -11,7 +11,7 @@ use core::ffi::c_void;
 use reverie_common::consts;
 use reverie_common::local_state::*;
 
-use reverie_syscalls::*;
+use syscalls::*;
 
 static SYSCALL_UNTRACED: u64 = 0x7000_0000;
 static SYSCALL_TRACED: u64 = 0x7000_0004;

diff --git a/reverie-tools-helper/src/lib.rs → reverie-helper/src/lib.rs b/reverie-tools-helper/src/lib.rs → reverie-helper/src/lib.rs
@@ -10,4 +10,4 @@ pub mod counter;
 pub mod ffi;
 
 pub use reverie_common as common;
-pub use reverie_syscalls as syscalls;
+pub use syscalls;
diff --git a/reverie-tools-helper/src/logger.rs → reverie-helper/src/logger.rs b/reverie-tools-helper/src/logger.rs → reverie-helper/src/logger.rs
@@ -17,7 +17,7 @@
 use log::{Log, Level, Metadata, Record, SetLoggerError};
 use core::fmt::{Arguments, Error, Write};
 
-use reverie_syscalls::*;
+use syscalls::*;
 use crate::spinlock::SpinLock;
 
 const RING_BUFF_SIZE: usize = 16384;

diff --git a/reverie-tools-helper/src/raw_syscall.S → reverie-helper/src/raw_syscall.S b/reverie-tools-helper/src/raw_syscall.S → reverie-helper/src/raw_syscall.S
diff --git a/reverie-tools-helper/src/remote_call.S → reverie-helper/src/remote_call.S b/reverie-tools-helper/src/remote_call.S → reverie-helper/src/remote_call.S
diff --git a/reverie-tools-helper/src/scinfo.h → reverie-helper/src/scinfo.h b/reverie-tools-helper/src/scinfo.h → reverie-helper/src/scinfo.h
diff --git a/reverie-tools-helper/src/spinlock.rs → reverie-helper/src/spinlock.rs b/reverie-tools-helper/src/spinlock.rs → reverie-helper/src/spinlock.rs
@@ -6,7 +6,7 @@
 //!
 use core::sync::atomic::{AtomicUsize, Ordering};
 
-use reverie_syscalls::syscall;
+use syscalls::syscall;
 
 /// spinlock struct
 #[derive(Default)]

diff --git a/reverie-tools-helper/src/trampoline.S → reverie-helper/src/trampoline.S b/reverie-tools-helper/src/trampoline.S → reverie-helper/src/trampoline.S
diff --git a/reverie-preloader/Cargo.toml b/reverie-preloader/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 path = "src/lib.rs"
 
 [dependencies]
-reverie-syscalls = { path = "../reverie-syscalls" }
+syscalls = { path = "../syscalls" }
 reverie-common = { path = "../reverie-common" }
 procfs = "0.5"
 nix = "0.14"

diff --git a/reverie-preloader/src/lib.rs b/reverie-preloader/src/lib.rs
@@ -5,7 +5,7 @@ use std::io::Result;
 pub mod relink;
 pub mod seccomp_bpf;
 
-use reverie_syscalls::*;
+use syscalls::*;
 use reverie_common::consts;
 
 #[link_section = ".init_array"]