调整文件布局, rs-timeout 为主目录, timeout.c 等为二级目录

24 files changed, 13 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 4ee2f61..e49b6bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 *~
 *.so
 *.dSYM
-rs-timeout/target
+target
diff --git a/rs-timeout/Cargo.lock b/Cargo.lock
index d914ba8..d914ba8 100644
--- a/rs-timeout/Cargo.lock
+++ b/Cargo.lock
diff --git a/rs-timeout/Cargo.toml b/Cargo.toml
index 5ff1035..6d32d4b 100644
--- a/rs-timeout/Cargo.toml
+++ b/Cargo.toml
@@ -2,9 +2,13 @@
 name = "rs-timeout"
 version = "0.1.0"
 edition = "2021"
+# build = "build.rs"
+
+[build]
+rustflags = ["-L", "./"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 libc = "0.2.0"
-bindgen = "0.68.1"
\ No newline at end of file
+bindgen = "0.68.1"
diff --git a/build.rs b/build.rs
new file mode 100644
index 0000000..2a90d96
--- /dev/null
+++ b/build.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let path = "./";
+    let lib = "timeout";
+
+    println!("cargo:rustc-link-search=all={}", path);
+    println!("cargo:rustc-link-lib=dylib={}", lib);
+}
diff --git a/Makefile b/timeout/Makefile
index 2a0b473..2a0b473 100644
--- a/Makefile
+++ b/timeout/Makefile
diff --git a/Rules.shrc b/timeout/Rules.shrc
index ece75d4..ece75d4 100644
--- a/Rules.shrc
+++ b/timeout/Rules.shrc
diff --git a/bench/Rules.mk b/timeout/bench/Rules.mk
index 3ee72f3..3ee72f3 100644
--- a/bench/Rules.mk
+++ b/timeout/bench/Rules.mk
diff --git a/bench/bench-add.lua b/timeout/bench/bench-add.lua
index 64a921d..64a921d 100755
--- a/bench/bench-add.lua
+++ b/timeout/bench/bench-add.lua
diff --git a/bench/bench-aux.lua b/timeout/bench/bench-aux.lua
index 6321247..6321247 100644
--- a/bench/bench-aux.lua
+++ b/timeout/bench/bench-aux.lua
diff --git a/bench/bench-del.lua b/timeout/bench/bench-del.lua
index 4306745..4306745 100755
--- a/bench/bench-del.lua
+++ b/timeout/bench/bench-del.lua
diff --git a/bench/bench-expire.lua b/timeout/bench/bench-expire.lua
index 3e6374e..3e6374e 100755
--- a/bench/bench-expire.lua
+++ b/timeout/bench/bench-expire.lua
diff --git a/bench/bench-heap.c b/timeout/bench/bench-heap.c
index f1166a4..f1166a4 100644
--- a/bench/bench-heap.c
+++ b/timeout/bench/bench-heap.c
diff --git a/bench/bench-llrb.c b/timeout/bench/bench-llrb.c
index bdb02f0..bdb02f0 100644
--- a/bench/bench-llrb.c
+++ b/timeout/bench/bench-llrb.c
diff --git a/bench/bench-wheel.c b/timeout/bench/bench-wheel.c
index 0cba1af..0cba1af 100644
--- a/bench/bench-wheel.c
+++ b/timeout/bench/bench-wheel.c
diff --git a/bench/bench.c b/timeout/bench/bench.c
index 0d4cee4..0d4cee4 100644
--- a/bench/bench.c
+++ b/timeout/bench/bench.c
diff --git a/bench/bench.h b/timeout/bench/bench.h
index bc1f7cf..bc1f7cf 100644
--- a/bench/bench.h
+++ b/timeout/bench/bench.h
diff --git a/bench/bench.plt b/timeout/bench/bench.plt
index 6e143c6..6e143c6 100644
--- a/bench/bench.plt
+++ b/timeout/bench/bench.plt
diff --git a/lua/Rules.mk b/timeout/lua/Rules.mk
index 0f06fce..0f06fce 100644
--- a/lua/Rules.mk
+++ b/timeout/lua/Rules.mk
diff --git a/lua/timeout-lua.c b/timeout/lua/timeout-lua.c
index 4d4e54c..4d4e54c 100644
--- a/lua/timeout-lua.c
+++ b/timeout/lua/timeout-lua.c
diff --git a/test-timeout.c b/timeout/test-timeout.c
index ab9f72d..ab9f72d 100644
--- a/test-timeout.c
+++ b/timeout/test-timeout.c
diff --git a/timeout-bitops.c b/timeout/timeout-bitops.c
index d8325db..d8325db 100644
--- a/timeout-bitops.c
+++ b/timeout/timeout-bitops.c
diff --git a/timeout-debug.h b/timeout/timeout-debug.h
index fc727a6..fc727a6 100644
--- a/timeout-debug.h
+++ b/timeout/timeout-debug.h
diff --git a/timeout.c b/timeout/timeout.c
index e78f57d..e78f57d 100644
--- a/timeout.c
+++ b/timeout/timeout.c
diff --git a/timeout.h b/timeout/timeout.h
index 3ef76e9..3ef76e9 100644
--- a/timeout.h
+++ b/timeout/timeout.h