Replace debug_assert with warn for SendRecvFlags

This commit is contained in:
Marsman1996
2024-12-10 11:04:42 +08:00
committed by Tate, Hongliang Tian
parent fbe7734a5c
commit 2ec907875c
5 changed files with 28 additions and 9 deletions

View File

@ -325,7 +325,9 @@ impl Socket for DatagramSocket {
flags: SendRecvFlags, flags: SendRecvFlags,
) -> Result<usize> { ) -> Result<usize> {
// TODO: Deal with flags // TODO: Deal with flags
debug_assert!(flags.is_all_supported()); if !flags.is_all_supported() {
warn!("unsupported flags: {:?}", flags);
}
let MessageHeader { let MessageHeader {
addr, addr,
@ -361,7 +363,9 @@ impl Socket for DatagramSocket {
flags: SendRecvFlags, flags: SendRecvFlags,
) -> Result<(usize, MessageHeader)> { ) -> Result<(usize, MessageHeader)> {
// TODO: Deal with flags // TODO: Deal with flags
debug_assert!(flags.is_all_supported()); if !flags.is_all_supported() {
warn!("unsupported flags: {:?}", flags);
}
let (received_bytes, peer_addr) = self.recv(writer, flags)?; let (received_bytes, peer_addr) = self.recv(writer, flags)?;

View File

@ -567,7 +567,9 @@ impl Socket for StreamSocket {
flags: SendRecvFlags, flags: SendRecvFlags,
) -> Result<usize> { ) -> Result<usize> {
// TODO: Deal with flags // TODO: Deal with flags
debug_assert!(flags.is_all_supported()); if !flags.is_all_supported() {
warn!("unsupported flags: {:?}", flags);
}
let MessageHeader { let MessageHeader {
control_message, .. control_message, ..
@ -591,7 +593,9 @@ impl Socket for StreamSocket {
flags: SendRecvFlags, flags: SendRecvFlags,
) -> Result<(usize, MessageHeader)> { ) -> Result<(usize, MessageHeader)> {
// TODO: Deal with flags // TODO: Deal with flags
debug_assert!(flags.is_all_supported()); if !flags.is_all_supported() {
warn!("unsupported flags: {:?}", flags);
}
let (received_bytes, _) = self.recv(writer, flags)?; let (received_bytes, _) = self.recv(writer, flags)?;

View File

@ -315,7 +315,9 @@ impl Socket for UnixStreamSocket {
flags: SendRecvFlags, flags: SendRecvFlags,
) -> Result<usize> { ) -> Result<usize> {
// TODO: Deal with flags // TODO: Deal with flags
debug_assert!(flags.is_all_supported()); if !flags.is_all_supported() {
warn!("unsupported flags: {:?}", flags);
}
let MessageHeader { let MessageHeader {
control_message, .. control_message, ..
@ -335,7 +337,9 @@ impl Socket for UnixStreamSocket {
flags: SendRecvFlags, flags: SendRecvFlags,
) -> Result<(usize, MessageHeader)> { ) -> Result<(usize, MessageHeader)> {
// TODO: Deal with flags // TODO: Deal with flags
debug_assert!(flags.is_all_supported()); if !flags.is_all_supported() {
warn!("unsupported flags: {:?}", flags);
}
let received_bytes = self.recv(writer, flags)?; let received_bytes = self.recv(writer, flags)?;

View File

@ -72,7 +72,10 @@ impl Connected {
pub fn send(&self, reader: &mut dyn MultiRead, flags: SendRecvFlags) -> Result<usize> { pub fn send(&self, reader: &mut dyn MultiRead, flags: SendRecvFlags) -> Result<usize> {
let mut connection = self.connection.disable_irq().lock(); let mut connection = self.connection.disable_irq().lock();
debug_assert!(flags.is_all_supported()); // TODO: Deal with flags
if !flags.is_all_supported() {
warn!("unsupported flags: {:?}", flags);
}
let buf_len = reader.sum_lens(); let buf_len = reader.sum_lens();
VSOCK_GLOBAL VSOCK_GLOBAL
.get() .get()

View File

@ -303,7 +303,9 @@ impl Socket for VsockStreamSocket {
flags: SendRecvFlags, flags: SendRecvFlags,
) -> Result<usize> { ) -> Result<usize> {
// TODO: Deal with flags // TODO: Deal with flags
debug_assert!(flags.is_all_supported()); if !flags.is_all_supported() {
warn!("unsupported flags: {:?}", flags);
}
let MessageHeader { let MessageHeader {
control_message, .. control_message, ..
@ -323,7 +325,9 @@ impl Socket for VsockStreamSocket {
flags: SendRecvFlags, flags: SendRecvFlags,
) -> Result<(usize, MessageHeader)> { ) -> Result<(usize, MessageHeader)> {
// TODO: Deal with flags // TODO: Deal with flags
debug_assert!(flags.is_all_supported()); if !flags.is_all_supported() {
warn!("unsupported flags: {:?}", flags);
}
let (received_bytes, _) = self.recv(writer, flags)?; let (received_bytes, _) = self.recv(writer, flags)?;