formatting and small changes

codeaucafe · codeaucafe · commit faee7d13a46d · 2020-04-01T02:39:45.000-07:00
diff --git a/src/06-thread-safety/unsafe_bank.py b/src/06-thread-safety/unsafe_bank.py
@@ -1,7 +1,7 @@
 import datetime
 import random
 import time
-from threading import Thread
+from threading import Thread, RLock
 from typing import List
 
 
@@ -55,14 +55,21 @@ def create_accounts() -> List[Account]:
     ]
 
 
+transfer_lock = RLock()
+
 def do_transfer(from_account: Account, to_account: Account, amount: int):
     if from_account.balance < amount:
         return
 
+    # Not so good:
+    transfer_lock.acquire()
+
     from_account.balance -= amount
     time.sleep(.000)
     to_account.balance += amount
 
+    transfer_lock.release()
+
 
 def validate_bank(accounts: List[Account], total: int, quiet=False):
     current = sum(a.balance for a in accounts)
diff --git a/src/09-built-on-asyncio/the_trio/prod_trio.py b/src/09-built-on-asyncio/the_trio/prod_trio.py
@@ -2,6 +2,7 @@
 import colorama
 import random
 import trio
+from trio._core import Nursery
 
 
 async def main():
@@ -12,6 +13,7 @@ async def main():
 
     with trio.move_on_after(5):
         async with trio.open_nursery() as nursery:
+            nursery: Nursery = nursery
             nursery.start_soon(generate_data, 20, data, name='Prod 1')
             nursery.start_soon(generate_data, 20, data, name='Prod 2')
             nursery.start_soon(process_data, 40, data, name='Consumer')
diff --git a/src/10-async-web/acityscape_api/requirements.txt b/src/10-async-web/acityscape_api/requirements.txt
@@ -8,4 +8,4 @@ cchardet
 # This one can give you trouble on Windows
 # Feel free to uncomment it but it also works without it
 # Just a little less well.
-# aiodns
+aiodns
diff --git a/src/10-async-web/acityscape_api/services/location_service.py b/src/10-async-web/acityscape_api/services/location_service.py
@@ -4,7 +4,7 @@
 
 import aiohttp
 
-use_cached_data = False
+use_cached_data = True
 
 measured_latency_in_sec = [
     0.28844, 0.334694, 0.33468, 0.343911, 0.339515, 0.344329, 0.341594, 0.352366,
diff --git a/src/10-async-web/acityscape_api/services/sun_service.py b/src/10-async-web/acityscape_api/services/sun_service.py
@@ -6,7 +6,7 @@
 import aiohttp
 
 measured_latency_in_sec = [0.399203, 0.7046, 0.422959, 0.741911, 0.404674]
-use_cached_data = False
+use_cached_data = True
 
 
 async def for_today(latitude: float, longitude: float) -> dict:
diff --git a/src/11-cython/perf/compute_threaded.py b/src/11-cython/perf/compute_threaded.py
@@ -27,7 +27,7 @@ def main():
     dt = datetime.datetime.now() - t0
     print("Done in {:,.2f} sec. (factor: {:,.2f}x)".format(
         dt.total_seconds(),
-        8.54/dt.total_seconds())
+        8.54 / dt.total_seconds())
     )
 
 
@@ -41,3 +41,29 @@ def do_math(start=0, num=10):
 
 if __name__ == '__main__':
     main()
+
+import logging
+import threading
+import time
+
+
+def thread_function(name):
+    logging.info("Thread %s: starting", name)
+    time.sleep(2)
+    logging.info("Thread %s: finishing", name)
+
+
+def main():
+    format = "%(asctime)s: %(message)s"
+    logging.basicConfig(format=format, level=logging.INFO,
+                        datefmt="%H:%M:%S")
+
+    logging.info("Main    : before creating thread")
+    x = threading.Thread(target=thread_function, args=(1,))
+    logging.info("Main    : before running thread")
+    x.start()
+    logging.info("Main    : wait for the thread to finish")
+    x.join()
+    logging.info("Main    : all done")
+
+main()
diff --git a/src/11-cython/perf/math_core.pyx b/src/11-cython/perf/math_core.pyx
@@ -2,6 +2,7 @@ from libc.math cimport sqrt
 
 import cython
 
+
 def do_math(start: cython.float = 0, num: cython.float = 10):
     pos: cython.float = start
     k_sq: cython.float = 1000 * 1000
