Merge branch 'main' into docker_epoll

Author: psalm842

README.md

@@ -43,8 +43,16 @@ With the following software and hardware list you can run all code files present
 | 1-10 | Rust (version 1.51 or later) | Windows, macOS, or Linux |
 
 ## Errata
-* Page 58 (Paragraph 3, line 1): **create** _should be_ **crate** 
-
+* Page 58 (Paragraph 3, line 1): **create** _should be_ **crate**
+* Page 10 (Paragraph 8, line 3): **240 beers** _should be_ **180 beers**
+* Page 10 (Paragraph 9, line 1): **240 beers** _should be_ **180 beers**
+* Page 10 (Paragraph 9, line 4): **180 beers** _should be_ **170 beers**
+* Page 10 (Paragraph 10, line 1): **360 beers** _should be_ **340 beers**
+* Page 11 (Paragraph 2, line 2): **230 orders** _should be_ **175 orders**
+* Page 11 (Paragraph 2, line 3): **460 beers** _should be_ **350 beers**
+* Page 152 (Paragraph 3, line 1): **we** _should be_ **We**
+* Page 163 (Paragraph 4, line 2): **The next `coroutine/wait` function is `read_requests`** _should be_ **The next `coroutine/wait` function is `requests`**
+* Page 17 (Paragraph 3, line 2): **dye** _should be_ **die**
 
 ### Related products
 * Hands-On Concurrency with Rust [[Packt]](https://www.packtpub.com/product/hands-on-concurrency-with-rust/9781788399975) [[Amazon]](https://www.amazon.com/Hands-Concurrency-Rust-Confidently-memory-safe/dp/1788399978/ref=sr_1_1?crid=1S3COJO6XGV3Z&keywords=Hands-On+Concurrency+with+Rust&qid=1707141930&sprefix=hands-on+concurrency+with+rust%2Caps%2C291&sr=8-1)

ch01/a-assembly-dereference/src/main.rs

@@ -4,7 +4,7 @@
 //! ## FIX ISSUE #11:
 //! See:https://github.com/PacktPublishing/Asynchronous-Programming-in-Rust/issues/11
 //! The book didn't make it clear that this example will only work on `x86-64` architecture,
-//! so users on newer M-series macs (which uses the ARM64 instruciton set), will get a
+//! so users on newer M-series macs (which uses the ARM64 instruction set), will get a
 //! compilation error. This is solved by conditionally compiling a version that works
 //! with the  ARM64 instruction set.
 
@@ -20,7 +20,7 @@ fn main() {
     println!("{}", x);
 }
 
-#[cfg(target_arch = "x86-64")]
+#[cfg(target_arch = "x86_64")]
 fn dereference(ptr: *const usize) -> usize {
     let mut res: usize;
     unsafe {

ch03/a-raw-syscall/src/main.rs

@@ -50,7 +50,7 @@ fn syscall(message: String) {
 }
 
 // ----------------------------------------------------------------------------
-// macOS raw syscall when running newer M familiy CPU (ARM 64 architecture)
+// macOS raw syscall when running newer M family CPU (ARM 64 architecture)
 // ----------------------------------------------------------------------------
 
 #[cfg(all(target_os = "macos", target_arch = "aarch64"))]

ch04/a-epoll/src/main.rs

@@ -52,9 +52,7 @@ fn handle_events(
             match streams[index].read(&mut data) {
                 Ok(n) if n == 0 => {
                     // FIX #4
-                    // `insert` returns false if the value already existed in the set. We
-                    // handle it here since we must be sure that the TcpStream is fully
-                    // drained due to using edge triggered epoll.
+                    // `insert` returns false if the value already existed in the set.
                     if !handled.insert(index) {
                         break;
                     }

ch04/a-epoll/src/poll.rs

@@ -45,7 +45,7 @@ impl Poll {
             return Err(io::Error::last_os_error());
         };
 
-        // This is safe because epol_wait ensures that `res` events are assigned.
+        // This is safe because epoll_wait ensures that `res` events are assigned.
         unsafe { events.set_len(res as usize) };
         Ok(())
     }

ch04/b-epoll-mio/src/main.rs

@@ -59,9 +59,7 @@ fn handle_events(events: &[Event], streams: &mut [TcpStream], handled: &mut Hash
             match streams[index].read(&mut data) {
                 Ok(n) if n == 0 => {
                     // FIX #4
-                    // `insert` returns false if the value already existed in the set. We
-                    // handle it here since we must be sure that the TcpStream is fully
-                    // drained due to using edge triggered epoll.
+                    // `insert` returns false if the value already existed in the set.
                     if !handled.insert(index) {
                         break;
                     }

ch05/d-fibers-closure/src/main.rs

@@ -197,7 +197,7 @@ unsafe fn switch() {
     );
 }
 
-// The main function has aslo changed
+// The main function has also changed
 #[cfg(not(windows))]
 pub fn main() {
     let mut runtime = Runtime::new();

ch07/a-coroutine/src/main.rs

@@ -1,6 +1,7 @@
 use std::{
     thread,
     time::Duration,
+    Instant
 };
 
 mod future;

ch07/corofy/src/lib.rs

@@ -295,7 +295,7 @@ impl Future for Coroutine{id} {{
         // We need to special case the first call since that
         // happens before we reach an `await` point
 
-        // This will recieve the input args to the function
+        // This will receive the input args to the function
         let impl_fut_first_args = format_args_names_only(&args);
 
         if i == 0 {
@@ -332,7 +332,7 @@ impl Future for Coroutine{id} {{
 "
             )?;
 
-        // These steps are await-ponts where we await a future
+        // These steps are await-points where we await a future
         } else if i < steps.len() - 1 {
             let varname = &futures[i - 1].0;
             let fut = &futures[i].1;

delayserver/src/main.rs

@@ -4,12 +4,13 @@ use actix_web::{Responder, get, HttpServer, App, web, rt::time::sleep};
 const EXPLANATION: &str =
 "USAGE:
 Delay server works by issuing a http GET request in the format:
-http://localhost:8080/[delay in ms]/[UrlEncoded meesage]
+http://localhost:8080/[delay in ms]/[UrlEncoded message]
 
 If an argument is passed in when delayserver is started, that
 argument will be used as the url instead of 'localhost'
 
-On reception, it immidiately reports the following to the console:
+On reception, it immieiately reports the following to the console:
+
 {Message #} - {delay in ms}: {message}
 
 The server then delays the response for the requested time and echoes the message back to the caller.