Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rtracy"
version = "0.1.4"
version = "0.1.5"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -10,4 +10,4 @@ bincode = "2.0.1"
lz4 = "1.28.1"
num-traits = "0.2.19"
num-derive = "0.4.2"
clap = { version = "4.5.34", features = ["derive"] }
clap = { version = "4.5.54", features = ["derive"] }
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# RTracy server
This is server for streaming .utacy files generated by https://github.com/ParadiseSS13/byond-tracy to tracy https://github.com/wolfpld/tracy profiler

Works with Tracy 0.12.2 (protocol 74)
Works with Tracy 0.13.1 (protocol 77)

This server allow partial streaming of large snapshots to prevent huge memory usage

Expand Down
5 changes: 2 additions & 3 deletions src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ pub fn handle_client(stream: TcpStream, header: &UTracyHeader, locations: &Vec<S
return Err(format!("Invalid client, expected \"TracyPrf\", got {}", std::str::from_utf8(&client_name).unwrap()));
}
let version: u32 = bincode::decode_from_reader(&mut reader, BINCODE_CONFIG).map_err(|e| format!("{}", e))?;
if version != 74 {
if version != 76 {
writer.write(&[HandshakeStatus::HandshakeProtocolMismatch as u8]).map_err(|e| format!("{}", e))?;
return Err(format!("Invalid client version, expected 74, got {}", version));
return Err(format!("Invalid client version, expected 76, got {}", version));
}

writer.write(&[HandshakeStatus::HandshakeWelcome as u8]).map_err(|e| format!("{}", e))?;
Expand All @@ -223,7 +223,6 @@ pub fn handle_client(stream: TcpStream, header: &UTracyHeader, locations: &Vec<S
multiplier: header.multiplier,
init_begin: header.init_begin,
init_end: header.init_end,
delay: header.delay,
resolution: header.resolution,
epoch: header.epoch,
exec_time: header.exec_time,
Expand Down
5 changes: 3 additions & 2 deletions src/structs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub struct UTracyHeader {
pub multiplier: f64,
pub init_begin: u64,
pub init_end: u64,
pub delay: u64,
_delay: u64,
pub resolution: u64,
pub epoch: u64,
pub exec_time: u64,
Expand Down Expand Up @@ -220,7 +220,6 @@ pub struct NetworkHeader {
pub multiplier: f64,
pub init_begin: u64,
pub init_end: u64,
pub delay: u64,
pub resolution: u64,
pub epoch: u64,
pub exec_time: u64,
Expand Down Expand Up @@ -391,6 +390,7 @@ pub enum QueryResponseType {
ThreadWakeup,
GpuTime,
GpuContextName,
GpuAnnotationName,
CallstackFrameSize,
SymbolInformation,
ExternalNameMetadata,
Expand Down Expand Up @@ -441,6 +441,7 @@ pub enum QueryResponseType {
SecondStringData,
MemNamePayload,
ThreadGroupHint,
GpuZoneAnnotation,
StringData,
ThreadName,
PlotName,
Expand Down