Skip to content

Commit 937a3a5

Browse files
committed
Added Timing profiler + Panic guards
1 parent dd4dc1b commit 937a3a5

27 files changed

Lines changed: 1241 additions & 1102 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ libs/ChromatiCraft 1.7.10 V33a.jar
3535
libs/DragonAPI 1.7.10 V33b.jar
3636
/optimizationsandtweaks_pathfinding/target
3737
/CoroUtil
38+
/optimizationsandtweaks_profiler/target
Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1 @@
1-
// TODO
2-
use optimizationsandtweaks_shared::{init_panic_logging, log_native_line};
3-
use jni::JNIEnv;
4-
use jni::objects::{JClass, JString};
5-
use jni::sys::{jint, jstring, JNI_VERSION_1_6};
6-
use std::os::raw::c_void;
7-
#[no_mangle]
8-
pub unsafe extern "system" fn JNI_OnLoad(_vm: *mut jni::sys::JavaVM, _reserved: *mut c_void) -> jint {
9-
// Init panic hook and any global state here.
10-
init_panic_logging();
11-
log_native_line("JNI_OnLoad: library loaded");
12-
13-
// Return the JNI version we support.
14-
JNI_VERSION_1_6
15-
}
16-
17-
#[no_mangle]
18-
pub unsafe extern "system" fn JNI_OnUnload(_vm: *mut jni::sys::JavaVM, _reserved: *mut c_void) {
19-
log_native_line("JNI_OnUnload: library unloading");
20-
}
21-
22-
/// Simple void function that logs a message. JNI signature: ()V
23-
#[no_mangle]
24-
pub extern "system" fn Java_com_example_native_NativeLib_rustHelloWorld(
25-
_env: JNIEnv,
26-
_class: JClass,
27-
) {
28-
log_native_line("Hello from Rust (hello_world)");
29-
}
30-
31-
/// Returns a Java string. JNI signature: ()Ljava/lang/String;
32-
#[no_mangle]
33-
pub extern "system" fn Java_com_example_native_NativeLib_getHelloString(
34-
mut env: JNIEnv,
35-
_class: JClass,
36-
) -> jstring {
37-
let s = env
38-
.new_string("Hello from Rust!")
39-
.expect("Couldn't create java string");
40-
s.into_raw()
41-
}
42-
43-
/// Receives a Java string and logs it. JNI signature: (Ljava/lang/String;)V
44-
#[no_mangle]
45-
pub extern "system" fn Java_com_example_native_NativeLib_printMessage(
46-
mut env: JNIEnv,
47-
_class: JClass,
48-
message: JString,
49-
) {
50-
if let Ok(msg) = env.get_string(&message) {
51-
let msg_str: String = msg.into();
52-
log_native_line(&format!("Java->Rust message: {}", msg_str));
53-
} else {
54-
log_native_line("Java->Rust message: <invalid string>");
55-
}
56-
}
1+
// TODO

optimizationsandtweaks_pathfinding/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ leaktracer = "0.1"
1414
rayon = "1.10"
1515
crossbeam = "0.8"
1616
lru = "0.12"
17-
optimizationsandtweaks_shared = { path = "../optimizationsandtweaks_shared" }
17+
optimizationsandtweaks_shared = { path = "../optimizationsandtweaks_shared" }
18+
optimizationsandtweaks_profiler = { path = "../optimizationsandtweaks_profiler" }

0 commit comments

Comments
 (0)