Cleanup

Zardshard · Zardshard · commit 118f940f0b8c · 2024-10-15T18:15:23.000-04:00
diff --git a/Jamfile b/Jamfile
@@ -74,7 +74,24 @@ install_location ?=
 	/boot/system/non-packaged/lib/python$(python_version)/site-packages ;
 
 # Where to search for .cpp files
-SEARCH_SOURCE += bindings/interface bindings/app bindings/support bindings/storage bindings/kernel bindings/translation bindings/add-ons/screen_saver bindings/add-ons/registrar bindings/add-ons/graphics bindings/add-ons/input_server bindings/add-ons/mail_daemon bindings/add-ons/network_settings bindings/drivers bindings/device bindings/mail bindings/locale bindings/media ;
+SEARCH_SOURCE +=
+	bindings/interface
+	bindings/app
+	bindings/support
+	bindings/storage
+	bindings/kernel
+	bindings/translation
+	bindings/add-ons/screen_saver
+	bindings/add-ons/registrar
+	bindings/add-ons/graphics
+	bindings/add-ons/input_server
+	bindings/add-ons/mail_daemon
+	bindings/add-ons/network_settings
+	bindings/drivers
+	bindings/device
+	bindings/mail
+	bindings/locale
+	bindings/media ;
 
 # Where to look for header files
 SubDirHdrs headers ;
diff --git a/bindings/app/Application.cpp b/bindings/app/Application.cpp
@@ -50,6 +50,11 @@ class PyBApplication : public BApplication{
             PYBIND11_OVERLOAD(status_t, BApplication, Archive, data, deep);
         }
         thread_id			Run() override {
+            // There is no need to release the GIL here like RunWrapper. Here,
+            // the GIL starts off unacquired, whereas in RunWrapper, the GIL
+            // starts off acquired. Here, only if pybind sees that there
+            // is a Python function overriding Run that needs to be run will
+            // it acquire the GIL. Otherwise, it stays unacquired.
             PYBIND11_OVERLOAD(thread_id, BApplication, Run);
         }
         void				Quit() override {
diff --git a/bindings/app/Looper.cpp b/bindings/app/Looper.cpp
@@ -55,13 +55,15 @@ class PyBLooper : public BLooper{
 			PYBIND11_OVERLOAD(thread_id, BLooper, Run);
 		}
 		void		Quit() override {
-			py::gil_scoped_acquire acquire;
+			{
+				py::gil_scoped_acquire acquire;
 
-			// Not sure if it's actually necessary to release the reference
-			// to ourselves, since we will delete ourselves anyway.
-			// FIXME: What if the Python overload never actually calls
-			// BLooper::Quit?
-			do_not_delete.release();
+				// Not sure if it's actually necessary to release the reference
+				// to ourselves, since we will delete ourselves anyway.
+				// FIXME: What if the Python overload never actually calls
+				// BLooper::Quit?
+				do_not_delete.release();
+			}
 
 			PYBIND11_OVERLOAD(void, BLooper, Quit);
 		}

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,11 @@ class PyBApplication : public BApplication{`
`50`	`50`	`PYBIND11_OVERLOAD(status_t, BApplication, Archive, data, deep);`
`51`	`51`	`}`
`52`	`52`	`thread_id Run() override {`
	`53`	`+ // There is no need to release the GIL here like RunWrapper. Here,`
	`54`	`+ // the GIL starts off unacquired, whereas in RunWrapper, the GIL`
	`55`	`+ // starts off acquired. Here, only if pybind sees that there`
	`56`	`+ // is a Python function overriding Run that needs to be run will`
	`57`	`+ // it acquire the GIL. Otherwise, it stays unacquired.`
`53`	`58`	`PYBIND11_OVERLOAD(thread_id, BApplication, Run);`
`54`	`59`	`}`
`55`	`60`	`void Quit() override {`