diff --git a/src/lib.rs b/src/lib.rs index 43d9aaa..b3aa158 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,7 +6,7 @@ use env_logger::filter::Builder as FilterBuilder; use log::{set_boxed_logger, LevelFilter, SetLoggerError}; use logger::Configuration; use parking_lot::RwLock; -use std::{fmt, io, sync::Arc, time::SystemTime}; +use std::{fmt, io, process, sync::Arc, time::SystemTime}; use thiserror::Error; mod events; @@ -160,8 +160,6 @@ enum TagMode { /// `pmsg` device without paying the price for system calls twice. struct Record<'tag, 'msg> { timestamp: SystemTime, - pid: u16, - thread_id: u16, buffer_id: Buffer, tag: &'tag str, priority: Priority, @@ -440,22 +438,12 @@ impl Builder { /// # use android_logd_logger::{Buffer, Priority}; /// # use std::time::SystemTime; /// -/// android_logd_logger::log(SystemTime::now(), Buffer::Main, Priority::Info, 0, 0, "tag", "message").unwrap(); +/// android_logd_logger::log(SystemTime::now(), Buffer::Main, Priority::Info, "tag", "message").unwrap(); /// ``` #[cfg(target_os = "android")] -pub fn log( - timestamp: SystemTime, - buffer_id: Buffer, - priority: Priority, - pid: u16, - thread_id: u16, - tag: &str, - message: &str, -) -> Result<(), Error> { +pub fn log(timestamp: SystemTime, buffer_id: Buffer, priority: Priority, tag: &str, message: &str) -> Result<(), Error> { let record = Record { timestamp, - pid, - thread_id, buffer_id, tag, priority, @@ -477,22 +465,12 @@ pub fn log( /// # use android_logd_logger::{Buffer, Priority}; /// # use std::time::SystemTime; /// -/// android_logd_logger::log(SystemTime::now(), Buffer::Main, Priority::Info, 0, 0, "tag", "message").unwrap(); +/// android_logd_logger::log(SystemTime::now(), Buffer::Main, Priority::Info, "tag", "message").unwrap(); /// ``` #[cfg(not(target_os = "android"))] -pub fn log( - timestamp: SystemTime, - buffer_id: Buffer, - priority: Priority, - pid: u16, - thread_id: u16, - tag: &str, - message: &str, -) -> Result<(), Error> { +pub fn log(timestamp: SystemTime, buffer_id: Buffer, priority: Priority, tag: &str, message: &str) -> Result<(), Error> { let record = Record { timestamp, - pid, - thread_id, buffer_id, tag, priority, @@ -520,8 +498,6 @@ fn log_record(record: &Record) -> Result<(), Error> { tag, priority, message, - thread_id, - pid, .. } = record; @@ -533,6 +509,14 @@ fn log_record(record: &Record) -> Result<(), Error> { }) .and_then(|ts| ts.format(&DATE_TIME_FORMAT).map_err(|e| Error::Timestamp(e.to_string())))?; - eprintln!("{} {} {} {} {}: {}", timestamp, pid, thread_id, priority, tag, message); + eprintln!( + "{} {} {} {} {}: {}", + timestamp, + process::id(), + thread::id(), + priority, + tag, + message + ); Ok(()) } diff --git a/src/logd.rs b/src/logd.rs index ebc321b..095fa05 100644 --- a/src/logd.rs +++ b/src/logd.rs @@ -134,8 +134,6 @@ fn smoke() { let timestamp = SystemTime::now(); let record = Record { timestamp, - pid: std::process::id() as u16, - thread_id: thread::id() as u16, buffer_id: Buffer::Main, tag: "test", priority: Priority::Info, diff --git a/src/logger.rs b/src/logger.rs index 8bcd313..bdbee83 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -1,8 +1,8 @@ -use crate::{thread, Buffer, Priority, Record, TagMode}; +use crate::{Buffer, Priority, Record, TagMode}; use env_logger::filter::{Builder, Filter}; use log::{LevelFilter, Log, Metadata}; use parking_lot::RwLock; -use std::{io, process, sync::Arc, time::SystemTime}; +use std::{io, sync::Arc, time::SystemTime}; /// Logger configuration. pub(crate) struct Configuration { @@ -240,8 +240,6 @@ impl Log for LoggerImpl { let timestamp = SystemTime::now(); let record = Record { timestamp, - pid: process::id() as u16, - thread_id: thread::id() as u16, buffer_id: configuration.buffer_id, tag, priority, diff --git a/src/pmsg.rs b/src/pmsg.rs index 3dabe2c..164d1ef 100644 --- a/src/pmsg.rs +++ b/src/pmsg.rs @@ -1,8 +1,9 @@ -use crate::{logging_iterator::NewlineScaledChunkIterator, Buffer, Priority, Record}; +use crate::{logging_iterator::NewlineScaledChunkIterator, thread, Buffer, Priority, Record}; use bytes::{BufMut, BytesMut}; use std::{ fs::{File, OpenOptions}, io::{self, Write}, + process, time::UNIX_EPOCH, }; @@ -63,11 +64,11 @@ fn log_pmsg_packet(record: &Record, msg_part: &str) { let mut buffer = bytes::BytesMut::with_capacity(packet_len as usize); let timestamp = record.timestamp.duration_since(UNIX_EPOCH).unwrap(); - write_pmsg_header(&mut buffer, packet_len, DUMMY_UID, record.pid); + write_pmsg_header(&mut buffer, packet_len, DUMMY_UID, process::id() as u16); write_log_header( &mut buffer, record.buffer_id, - record.thread_id, + thread::id() as u16, timestamp.as_secs() as u32, timestamp.subsec_nanos(), );