Latest

Author: raphaelcohn

workspace/linux-support/src/file_descriptors/character_device/CharacterDeviceFileDescriptor.rs

@@ -123,7 +123,7 @@ impl Read for CharacterDeviceFileDescriptor
 							EFAULT => panic!("The receive buffer pointer(s) point outside the process's address space"),
 							EINVAL => panic!("Invalid argument passed"),
 							EISDIR => panic!("`fd` refers to a directory"),
-							unexpected_error @ _ => unexpected_error!(read, "character device file descriptor" unexpected_error),
+							unexpected_error @ _ => unexpected_error!(read, "character device file descriptor", unexpected_error),
 						}
 					}
 					else
@@ -190,7 +190,7 @@ impl Write for CharacterDeviceFileDescriptor
 							EFAULT => panic!("The write buffer pointer(s) point outside the process's address space"),
 							EINVAL => panic!("Invalid argument passed"),
 							EDESTADDRREQ => panic!("`fd` refers to a datagram socket for which a peer address has not been set using `connect()`"),
-							unexpected_error @ _ => unexpected_error!(write, "character device file descriptor" unexpected_error),
+							unexpected_error @ _ => unexpected_error!(write, "character device file descriptor", unexpected_error),
 						}
 					}
 					else
@@ -269,7 +269,7 @@ impl CharacterDeviceFileDescriptor
 					ENOSPC => panic!("`pathname` was to be created but the device containing `pathname` has no room for the new file"),
 					EPERM => panic!("The `O_NOATIME` flag was specified, but the effective user ID of the caller did not match the owner of the file and the caller was not privileged (`CAP_FOWNER`)"),
 
-					unexpected_error @ _ => unexpected_error!(open, "character device file descriptor" unexpected_error),
+					unexpected_error @ _ => unexpected_error!(open, "character device file descriptor", unexpected_error),
 				}
 			)
 		}

workspace/linux-support/src/file_descriptors/directory/DirectoryFileDescriptor.rs

@@ -803,7 +803,7 @@ impl DirectoryFileDescriptor
 
 			error @ SystemCallResult::InclusiveErrorRangeStartsFrom_usize ..= SystemCallResult::InclusiveErrorRangeEndsAt_usize => Err(SystemCallResult::usize_to_system_call_error_number(error).into()),
 
-			unexpected @ _ => unexpected_result!(statx, result),
+			unexpected @ _ => unexpected_result!(statx, unexpected),
 		}
 	}
 

workspace/linux-support/src/file_descriptors/file/c/flock.rs

@@ -37,7 +37,7 @@ impl flock
 
 		let process_identifier = match self.l_pid
 		{
-			1 ..= i32::MAX => Some(ProcessIdentifierChoice::Other(ProcessIdentifier::from(new_non_zero_i32(pid)))),
+			pid @ 1 ..= i32::MAX => Some(ProcessIdentifierChoice::Other(ProcessIdentifier::from(new_non_zero_i32(pid)))),
 
 			0 => Some(ProcessIdentifierChoice::Current),
 

workspace/linux-support/src/file_descriptors/process_identifier/ProcessIdentifierFileDescriptor.rs

@@ -133,7 +133,7 @@ impl ProcessIdentifierFileDescriptor
 			SystemCallResult::EINVAL_usize => panic!("flags is not 0"),
 			unexpected_error @ SystemCallResult::InclusiveErrorRangeStartsFrom_usize ..= SystemCallResult::InclusiveErrorRangeEndsAt_usize => unexpected_error!(pidfd_getfd, SystemCallResult::usize_to_system_call_error_number(unexpected_error)),
 
-			unexpected @ _ => unexpected_result!(pidfd_getfd, result),
+			unexpected @ _ => unexpected_result!(pidfd_getfd, unexpected),
 		}
 	}
 }

workspace/linux-support/src/file_descriptors/timerfd/TimerFileDescriptor.rs

@@ -2,8 +2,6 @@
 // Copyright © 2018-2019 The developers of file-descriptors. See the COPYRIGHT file in the top-level directory of this distribution and at https://raw.githubusercontent.com/lemonrock/file-descriptors/master/COPYRIGHT.
 
 
-use crate::syscall::SystemCallResult;
-
 /// Represents a timer instance.
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct TimerFileDescriptor(RawFd);
@@ -54,12 +52,9 @@ impl TimerFileDescriptor
 	#[inline(always)]
 	pub fn new(clock: TimerClock) -> Result<Self, CreationError>
 	{
-		use self::CreationError::*;
-		
-		xxx; fix me.
-		let result = unsafe { timerfd_create(clock as i32, TFD_NONBLOCK | TFD_CLOEXEC) };
+		use CreationError::*;
 
-		match result
+		match unsafe { timerfd_create(clock as i32, TFD_NONBLOCK | TFD_CLOEXEC) }
 		{
 			raw_file_descriptor @ SystemCallResult::InclusiveMinimumRawFileDescriptor_i32 ..= SystemCallResult::InclusiveMaximumRawFileDescriptor_i32 => Ok(Self(raw_file_descriptor)),
 
@@ -76,7 +71,7 @@ impl TimerFileDescriptor
 				}
 			),
 
-			_ => unexpected_result!(timerfd_create, result),
+			unexpected @ _ => unexpected_result!(timerfd_create, unexpected),
 		}
 	}
 
@@ -121,7 +116,7 @@ impl TimerFileDescriptor
 
 				0 => panic!("End of file but we haven't closed the file descriptor"),
 
-				unexpected @ _ => unexpected_result!(read, "timer file descriptor", unexpected_error),
+				unexpected @ _ => unexpected_result!(read, "timer file descriptor", unexpected),
 			}
 		}
 	}

workspace/linux-support/src/file_descriptors/timerfd/mod.rs

@@ -4,6 +4,7 @@
 
 use super::*;
 use self::c::*;
+use crate::syscall::SystemCallResult;
 
 
 mod c;

workspace/linux-support/src/file_descriptors/userfaultfd/UserFaultFileDescriptor.rs

@@ -206,7 +206,7 @@ impl UserFaultFileDescriptor
 			SystemCallResult::EINVAL_usize => panic!("Invalid combination of flags"),
 			unexpected_error @ _ => unexpected_error!(userfaultfd, SystemCallResult::usize_to_system_call_error_number(unexpected_error)),
 
-			unexpected @ _ => unexpected_result!(userfaultfd, result),
+			unexpected @ _ => unexpected_result!(userfaultfd, unexpected),
 		}
 	}
 

workspace/linux-support/src/io_uring/CompletionResponse.rs

@@ -6,21 +6,15 @@ macro_rules! unexpected_error_in_completion
 {
 	($self: ident, $function_name: tt) =>
 	{
-		{
-			const Literal: &'static str = concat!($function_name, " (completion)");
-			unexpected_error!(Literal, unsafe { SystemCallErrorNumber::from_unchecked($self.0) })
-		}
+		unexpected_error!($function_name, "completion", unsafe { SystemCallErrorNumber::from_unchecked($self.0) })
 	}
 }
 
 macro_rules! unexpected_result_in_completion
 {
 	($self: ident, $function_name: tt) =>
 	{
-		{
-			const Literal: &'static str = concat!($function_name, " (completion)");
-			unexpected_result!(Literal, unsafe { SystemCallErrorNumber::from_unchecked($self.0) })
-		}
+		unexpected_result!($function_name, "completion", unsafe { SystemCallErrorNumber::from_unchecked($self.0) })
 	}
 }
 

workspace/linux-support/src/io_uring/IoUringFileDescriptor.rs

@@ -131,7 +131,7 @@ impl IoUringFileDescriptor
 
 			error @ SystemCallResult::InclusiveErrorRangeStartsFrom_usize ..= SystemCallResult::InclusiveErrorRangeEndsAt_usize => Err(SystemCallResult::usize_to_system_call_error_number(error).into()),
 
-			unexpected @ _ => unexpected_result!(io_uring_setup, result),
+			unexpected @ _ => unexpected_result!(io_uring_setup, unexpected),
 		}
 	}
 
@@ -199,6 +199,17 @@ impl IoUringFileDescriptor
 	#[inline(always)]
 	fn register_buffers(&self, buffers: &[&mut [u8]]) -> io::Result<()>
 	{
+		/*
+			There are 28 errors in this file like the one below.
+			
+			All need converting to the new error format!!!!
+			
+			RJC
+		 */
+		
+		XXX:
+		
+		
 		let result = self.register_array(RegisterOperation::RegisterBuffers, buffers);
 
 		if likely!(result == 0)

workspace/linux-support/src/lib.rs

@@ -482,6 +482,7 @@ use libc::prctl;
 use libc::pread;
 use libc::process_vm_readv;
 use libc::process_vm_writev;
+use libc::pthread_getaffinity_np;
 use libc::pthread_self;
 use libc::pthread_setaffinity_np;
 use libc::pthread_sigmask;

workspace/linux-support/src/linux_kernel_modules/LinuxKernelModuleFileBaseName.rs

@@ -65,15 +65,12 @@ impl LinuxKernelModuleFileBaseName
     	}
 		const flags: i32 = 0;
 
-		match system_call_finit_module( file_descriptor, options.as_c_str(), flags)
+		match system_call_finit_module( file_descriptor, options.as_c_str(), flags).as_usize()
 		{
 			0 => Ok(true),
-
-			-1 => match SystemCallErrorNumber::from_errno_panic()
-			{
-				EPERM => Err(io_error_permission_denied("permission denied")),
-				unknown @ _ => Err(io_error_other(format!("Error Code was '{}'", unknown))),
-			},
+			
+			SystemCallResult::EPERM_usize => Err(io_error_permission_denied("permission denied")),
+			error @ SystemCallResult::InclusiveErrorRangeStartsFrom_usize ..= SystemCallResult::InclusiveErrorRangeEndsAt_usize => Err(SystemCallResult::usize_to_io_error(error)),
 
 			unexpected @ _ => unexpected_result!(finit_module, unexpected),
 		}

workspace/linux-support/src/linux_kernel_modules/LinuxKernelModuleName.rs

@@ -2,8 +2,6 @@
 // Copyright © 2020 The developers of linux-support. See the COPYRIGHT file in the top-level directory of this distribution and at https://raw.githubusercontent.com/lemonrock/linux-support/master/COPYRIGHT.
 
 
-use crate::syscall::SystemCallResult;
-
 /// A Linux kernel module name.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[derive(Deserialize, Serialize)]
@@ -247,22 +245,16 @@ impl LinuxKernelModuleName
 		let name: CString = self.into();
 		const flags: c_long = O_NONBLOCK as c_long;
 
-		let system_call_result = system_call_delete_module(name.as_c_str(), flags);
-		match system_call_result
+		match system_call_delete_module(name.as_c_str(), flags).as_usize()
 		{
 			0 => Ok(true),
 
-			-1 => match SystemCallErrorNumber::from_errno_panic()
-			{
-				EPERM => Err(io_error_permission_denied("permission denied")),
-				EBUSY => Err(io_error_permission_denied("busy")),
-				ENOENT => Ok(false),
-				EWOULDBLOCK => Err(io_error_permission_denied("in use")),
-
-				EFAULT => panic!("EFAULT should not occur"),
-				
-				unexpected_error @ _ => unexpected_error!(delete_module, SystemCallResult::usize_to_system_call_error_number(unexpected_error)),
-			},
+			SystemCallResult::EPERM_usize => Err(io_error_permission_denied("permission denied")),
+			SystemCallResult::EBUSY_usize => Err(io_error_permission_denied("busy")),
+			SystemCallResult::ENOENT_usize => Ok(false),
+			SystemCallResult::EWOULDBLOCK_usize => Err(io_error_permission_denied("in use")),
+			SystemCallResult::EFAULT_usize => panic!("EFAULT should not occur"),
+			unexpected_error @ SystemCallResult::InclusiveErrorRangeStartsFrom_usize ..= SystemCallResult::InclusiveErrorRangeEndsAt_usize => unexpected_error!(delete_module, SystemCallResult::usize_to_system_call_error_number(unexpected_error)),
 
 			unexpected @ _ => unexpected_result!(delete_module, unexpected),
 		}

workspace/linux-support/src/linux_kernel_modules/mod.rs

@@ -10,6 +10,7 @@ use crate::pci_express::PciDeviceAddress;
 use crate::user_and_groups::*;
 use crate::syscall::system_call_finit_module;
 use crate::syscall::system_call_delete_module;
+use crate::syscall::SystemCallResult;
 
 
 /// Parameters.

workspace/linux-support/src/memory/numa/NumaNode.rs

@@ -245,7 +245,7 @@ impl NumaNode
 			SystemCallResult::ENODEV_usize => panic!("OneOrMoreTargetNodesIsNotOnline"),
 			SystemCallResult::ESRCH_usize => if let Other(process_identifier) = process_identifier
 			{
-				Err(c(process_identifier))
+				Err(ProcessDoesNotExist(process_identifier))
 			}
 			else
 			{
@@ -318,8 +318,6 @@ impl NumaNode
 			{
 				panic!("We got ESRCH for ourselves?!")
 			},
-			SystemCallResult::
-			SystemCallResult::
 			SystemCallResult::EPERM_usize => match move_all
 			{
 				true => Err(CallerNeedsToHaveSysNiceCapabilityForMoveAll),

workspace/linux-support/src/memory/numa/SetMemoryPolicy.rs

@@ -75,7 +75,7 @@ impl SetMemoryPolicy
 			SystemCallResult::ENOMEM_usize => panic!("insufficient kernel memory was available."),
 			unexpected_error @ SystemCallResult::InclusiveErrorRangeStartsFrom_usize ..= SystemCallResult::InclusiveErrorRangeEndsAt_usize => unexpected_error!(set_mempolicy, SystemCallResult::usize_to_system_call_error_number(unexpected_error)),
 
-			unexpected @ _ => unexpected_result!(set_mempolicy, result),
+			unexpected @ _ => unexpected_result!(set_mempolicy, unexpected),
 		}
 	}
 

workspace/linux-support/src/mounts/Mount.rs

@@ -86,7 +86,7 @@ impl<'a> Mount<'a>
 				unexpected_error @ _ => unexpected_error!(umount, unexpected_error),
 			},
 
-			unexpected @ _ => unexpected!(umount, unexpected),
+			unexpected @ _ => unexpected_result!(umount, unexpected),
 		}
 	}
 

workspace/linux-support/src/resource_limits/SoftAndHardResourceLimit.rs

@@ -92,7 +92,7 @@ impl SoftAndHardResourceLimit
 				unexpected_error @ _ => unexpected_error!(setrlimit, unexpected_error),
 			},
 
-			unexpected @ _ => unexpected_result!(setrlimit, result),
+			unexpected @ _ => unexpected_result!(setrlimit, unexpected),
 		}
 	}
 
@@ -118,7 +118,7 @@ impl SoftAndHardResourceLimit
 				unexpected_error @ _ => unexpected_error!(getrlimit, unexpected_error),
 			},
 
-			unexpected @ _ => unexpected_result!(getrlimit, result)
+			unexpected @ _ => unexpected_result!(getrlimit, unexpected)
 		};
 
 		Self

workspace/linux-support/src/signals/Signals.rs

@@ -119,7 +119,7 @@ impl Signals
 			match SystemCallErrorNumber::from_errno_panic()
 			{
 				EINVAL => panic!("Invalid arguments"),
-				unexpected_error @ _ => unexpected_error!((sigfillset, result), unexpected_error),
+				unexpected_error @ _ => unexpected_error!(sigfillset, unexpected_error),
 			}
 		}
 		else

workspace/linux-support/src/syscall/SystemCallErrorNumber.rs

@@ -9215,9 +9215,9 @@ impl SystemCallErrorNumber
 
 	pub(crate) const InclusiveMaximumU16: u16 = 4095;
 
-	pub(crate) const InclusiveMinimumUsize: Usize = Self::InclusiveMinimumUsize as usize;
+	pub(crate) const InclusiveMinimumUsize: usize = Self::InclusiveMinimumUsize as usize;
 
-	pub(crate) const InclusiveMaximumUsize: Usize = Self::InclusiveMaximumUsize as Usize;
+	pub(crate) const InclusiveMaximumUsize: usize = Self::InclusiveMaximumUsize as usize;
 
 	pub(crate) const InclusiveMinimumI32: i32 = Self::InclusiveMinimumU16 as i32;
 

workspace/linux-support/src/vectors/vectored_read.rs

@@ -38,7 +38,7 @@ macro_rules! vectored_read
 						}
 						else if likely!(result == -1)
 						{
-							match SystemCallErrorNumber::from_errno()
+							match SystemCallErrorNumber::from_errno_panic()
 							{
 								EAGAIN => WouldBlock,
 								EINTR => Interrupted,
@@ -51,12 +51,12 @@ macro_rules! vectored_read
 								ENOTCONN => panic!("The socket is associated with a connection-oriented protocol and has not been connected"),
 								ENOTSOCK => panic!("The argument `sockfd` does not refer to a socket"),
 								EOPNOTSUPP => panic!("Some flags in the `flags` argument are inappropriate for the socket type"),
-								unexpected @ _ => unexpected_error!(vectored_read, unexpected),
+								unexpected @ _ => unexpected_error!(readv, unexpected),
 							}
 						}
 						else
 						{
-							unexpected_result!(vectored_read, result)
+							unexpected_result!(readv, result)
 						}
 					)
 				)

workspace/linux-support/src/vectors/vectored_write.rs

@@ -37,7 +37,7 @@ macro_rules! vectored_write
 						}
 						else if likely!(result == -1)
 						{
-							match SystemCallErrorNumber::from_errno()
+							match SystemCallErrorNumber::from_errno_panic()
 							{
 								EAGAIN => WouldBlock,
 								EINTR => Interrupted,
@@ -54,12 +54,12 @@ macro_rules! vectored_write
 								EMSGSIZE => panic!("The socket type requires that message be sent atomically, and the size of the message to be sent made this impossible"),
 								EISCONN => panic!("The connection-mode socket was connected already but a recipient was specified"),
 								EDESTADDRREQ => panic!("The socket is not connection-mode, and no peer address is set"),
-								unexpected @ _ => unexpected_error!(vectored_write, unexpected),
+								unexpected @ _ => unexpected_error!(writev, unexpected),
 							}
 						}
 						else
 						{
-							unexpected_result!(vectored_write, result)
+							unexpected_result!(writev, result)
 						}
 					)
 				)