daqbuf/daqbuf-netpod
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove warning, clean macro a bit

Browse Source
This commit is contained in:
Dominik Werder
2025-06-03 12:25:43 +02:00
parent 148bcf67f8
commit 98656ec554
3 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -22,4 +22,4 @@ url = "2.5.3"
num-traits = "0.2.16"
hex = "0.4.3"
rand = "0.8.5"
autoerr = "0.0.3"
autoerr = "0.0"

84
src/netpod.rs
View File

@@ -16,26 +16,31 @@ pub fn is_log_direct() -> bool {
*ONCE
}
pub mod log_tracing {
pub use tracing::{self, Level, event, span};
pub use tracing::{debug, error, info, trace, warn};
}
pub mod log_macros_branch {
#[allow(unused)]
#[macro_export]
macro_rules! branch_trace {
($($arg:tt)*) => {
($($arg:expr),*) => {
if $crate::is_log_direct() {
$crate::log_direct::trace!($($arg)*);
$crate::log_direct::trace!($($arg),*);
} else {
$crate::log::trace!($($arg)*);
$crate::log_tracing::trace!($($arg),*);
}
};
}
#[allow(unused)]
#[macro_export]
macro_rules! branch_debug {
($($arg:tt)*) => {
($($arg:expr),*) => {
if $crate::is_log_direct() {
$crate::log_direct::debug!($($arg)*);
$crate::log_direct::debug!($($arg),*);
} else {
$crate::log::debug!($($arg)*);
$crate::log_tracing::debug!($($arg),*);
}
};
}
@@ -46,7 +51,7 @@ pub mod log_macros_branch {
if $crate::is_log_direct() {
$crate::log_direct::info!($($arg)*);
} else {
$crate::log::info!($($arg)*);
$crate::log_tracing::info!($($arg)*);
}
};
}
@@ -57,7 +62,7 @@ pub mod log_macros_branch {
if $crate::is_log_direct() {
$crate::log_direct::warn!($($arg)*);
} else {
$crate::log::warn!($($arg)*);
$crate::log_tracing::warn!($($arg)*);
}
};
}
@@ -68,7 +73,7 @@ pub mod log_macros_branch {
if $crate::is_log_direct() {
$crate::log_direct::error!($($arg)*);
} else {
$crate::log::error!($($arg)*);
$crate::log_tracing::error!($($arg)*);
}
};
}
@@ -80,69 +85,78 @@ pub mod log_macros_branch {
pub use tracing::{self, Level, event, span};
}
pub mod log_macros {
pub mod log_direct_macros {
#[allow(unused)]
#[macro_export]
macro_rules! trace {
macro_rules! log_direct_trace {
($fmt:expr) => {
eprintln!(concat!("TRACE ", $fmt));
eprintln!("TRACE {}", format_args!($fmt));
};
($fmt:expr, $($arg:tt)*) => {
eprintln!(concat!("TRACE ", $fmt), $($arg)*);
($fmt:expr, $($arg:expr),*) => {
eprintln!("TRACE {}", format_args!($fmt, $($arg),*));
};
}
#[allow(unused)]
#[macro_export]
macro_rules! debug {
macro_rules! log_direct_debug {
($fmt:expr) => {
eprintln!(concat!("DEBUG ", $fmt));
eprintln!("DEBUG {}", format_args!($fmt));
};
($fmt:expr, $($arg:tt)*) => {
eprintln!(concat!("DEBUG ", $fmt), $($arg)*);
($fmt:expr, $($arg:expr),*) => {
eprintln!("DEBUG {}", format_args!($fmt, $($arg),*));
};
}
#[allow(unused)]
#[macro_export]
macro_rules! info {
macro_rules! log_direct_info {
($fmt:expr) => {
eprintln!(concat!("INFO ", $fmt));
eprintln!("INFO {}", format_args!($fmt));
};
($fmt:expr, $($arg:tt)*) => {
eprintln!(concat!("INFO ", $fmt), $($arg)*);
($fmt:expr, $($arg:expr),*) => {
eprintln!("INFO {}", format_args!($fmt, $($arg),*));
};
}
#[allow(unused)]
#[macro_export]
macro_rules! warn {
macro_rules! log_direct_warn {
($fmt:expr) => {
eprintln!(concat!("WARN ", $fmt));
eprintln!("WARN {}", format_args!($fmt));
};
($fmt:expr, $($arg:tt)*) => {
eprintln!(concat!("WARN ", $fmt), $($arg)*);
($fmt:expr, $($arg:expr),*) => {
eprintln!("WARN {}", format_args!($fmt, $($arg),*));
};
}
#[allow(unused)]
#[macro_export]
macro_rules! error {
macro_rules! log_direct_error {
($fmt:expr) => {
eprintln!(concat!("ERROR ", $fmt));
eprintln!("ERROR {}", format_args!($fmt));
};
($fmt:expr, $($arg:tt)*) => {
eprintln!(concat!("ERROR ", $fmt), $($arg)*);
($fmt:expr, $($arg:expr),*) => {
eprintln!("ERROR {}", format_args!($fmt, $($arg),*));
};
}
}
pub mod log {
pub use crate::branch_debug as debug;
pub use crate::branch_error as error;
pub use crate::branch_info as info;
pub use crate::branch_trace as trace;
pub use crate::branch_warn as warn;
pub use tracing::{self, Level, event, span};
pub use tracing::{debug, error, info, trace, warn};
}
pub mod log_direct {
pub use crate::{debug, error, info, trace, warn};
pub use crate::log_direct_debug as debug;
pub use crate::log_direct_error as error;
pub use crate::log_direct_info as info;
pub use crate::log_direct_trace as trace;
pub use crate::log_direct_warn as warn;
pub use tracing::{self, Level, event, span};
}
use crate::log::*;
use bytes::Bytes;
use chrono::DateTime;
use chrono::TimeZone;
@@ -4508,13 +4522,13 @@ pub fn req_uri_to_url(uri: &Uri) -> Result<Url, UriError> {
}
pub unsafe fn extltref<'a, 'b, T>(x: &'a T) -> &'b T {
&*(x as *const T)
unsafe { &*(x as *const T) }
}
pub unsafe fn extltref2<'a, 'b, T>(t: &'a T) -> &'b T {
core::mem::transmute(t)
unsafe { core::mem::transmute(t) }
}
pub unsafe fn extltmut<'a, 'b, T>(t: &'a mut T) -> &'b mut T {
core::mem::transmute(t)
unsafe { core::mem::transmute(t) }
}

6
src/query.rs
View File

@@ -2,10 +2,9 @@ pub mod api1;
pub mod datetime;
pub mod prebinned;
use crate::get_url_query_pairs;
use crate::log::*;
use crate::AggKind;
use crate::AppendToUrl;
use crate::DATETIME_FMT_6MS;
use crate::Error;
use crate::FromUrl;
use crate::HasBackend;
@@ -14,7 +13,8 @@ use crate::NanoRange;
use crate::PulseRange;
use crate::SfDbChannel;
use crate::ToNanos;
use crate::DATETIME_FMT_6MS;
use crate::get_url_query_pairs;
use crate::log::*;
use chrono::DateTime;
use chrono::TimeZone;
use chrono::Utc;