From b361310953a9d231926ec36f817666bf41cac3cc Mon Sep 17 00:00:00 2001 From: Samuka007 Date: Mon, 10 Mar 2025 14:04:37 +0800 Subject: [PATCH] fmt --- docs/community/contact/index.rst | 6 ------ kernel/src/net/socket/common/shutdown.rs | 3 ++- kernel/src/net/socket/inet/datagram/inner.rs | 5 ----- kernel/src/net/socket/inet/stream/inner.rs | 2 +- kernel/src/net/socket/inode.rs | 1 + kernel/src/net/socket/unix/stream/inner.rs | 1 + 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/docs/community/contact/index.rst b/docs/community/contact/index.rst index 0e529563..d85e0443 100644 --- a/docs/community/contact/index.rst +++ b/docs/community/contact/index.rst @@ -31,9 +31,3 @@ DragonOS是一个开源项目,我们欢迎任何形式的赞助和捐赠,您 ------------------------- DragonOS社区的捐赠信息将按年进行公开。赞助商、赞助者信息将在收到赞助后,15天内进行公开。 - -社区管理、财务及法务主体 -------------------------- - -灵高是DragonOS社区为满足相关监管合规要求,成立的 **非营利性质** 的单位。详情请见:https://ringotek.com.cn - diff --git a/kernel/src/net/socket/common/shutdown.rs b/kernel/src/net/socket/common/shutdown.rs index 847a8a0d..a510d613 100644 --- a/kernel/src/net/socket/common/shutdown.rs +++ b/kernel/src/net/socket/common/shutdown.rs @@ -1,4 +1,5 @@ -use core::{default, sync::atomic::AtomicU8}; +#![allow(dead_code)] +use core::sync::atomic::AtomicU8; use system_error::SystemError; diff --git a/kernel/src/net/socket/inet/datagram/inner.rs b/kernel/src/net/socket/inet/datagram/inner.rs index cbd49a57..d883cd14 100644 --- a/kernel/src/net/socket/inet/datagram/inner.rs +++ b/kernel/src/net/socket/inet/datagram/inner.rs @@ -122,11 +122,6 @@ impl BoundUdp { }) } - #[inline] - pub fn can_recv(&self) -> bool { - self.with_socket(|socket| socket.can_recv()) - } - pub fn try_send( &self, buf: &[u8], diff --git a/kernel/src/net/socket/inet/stream/inner.rs b/kernel/src/net/socket/inet/stream/inner.rs index 5146a913..eea311fb 100644 --- a/kernel/src/net/socket/inet/stream/inner.rs +++ b/kernel/src/net/socket/inet/stream/inner.rs @@ -132,7 +132,7 @@ impl Init { } else { smoltcp::wire::IpListenEndpoint::from(local) }; - log::debug!("listen at {:?}", listen_addr); + // log::debug!("listen at {:?}", listen_addr); let mut inners = Vec::new(); if let Err(err) = || -> Result<(), SystemError> { for _ in 0..(backlog - 1) { diff --git a/kernel/src/net/socket/inode.rs b/kernel/src/net/socket/inode.rs index 7deb7e92..60acae4a 100644 --- a/kernel/src/net/socket/inode.rs +++ b/kernel/src/net/socket/inode.rs @@ -30,6 +30,7 @@ impl IndexNode for Inode { data: crate::libs::spinlock::SpinLockGuard, ) -> Result { drop(data); + defer::defer!(log::debug!("write end.")); self.inner.write(buf) } diff --git a/kernel/src/net/socket/unix/stream/inner.rs b/kernel/src/net/socket/unix/stream/inner.rs index f4e0d384..d13121da 100644 --- a/kernel/src/net/socket/unix/stream/inner.rs +++ b/kernel/src/net/socket/unix/stream/inner.rs @@ -1,3 +1,4 @@ +#![allow(unused)] use core::sync::atomic::{AtomicUsize, Ordering}; use log::debug;