Merge pull request #287 from sunfishcode/wait-for-initialized

Ensure that initialization is complete after `set_logger_inner`.
rust-lang · Aug 2, 2018 · ea901a1 · ea901a1
2 parents 7a60286 + 7e443a0
commit ea901a1
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1151,13 +1151,18 @@ where
     F: FnOnce() -> &'static Log,
 {
     unsafe {
-        if STATE.compare_and_swap(UNINITIALIZED, INITIALIZING, Ordering::SeqCst) != UNINITIALIZED {
-            return Err(SetLoggerError(()));
+        match STATE.compare_and_swap(UNINITIALIZED, INITIALIZING, Ordering::SeqCst) {
+            UNINITIALIZED => {
+                LOGGER = make_logger();
+                STATE.store(INITIALIZED, Ordering::SeqCst);
+                Ok(())
+            }
+            INITIALIZING => {
+                while STATE.load(Ordering::SeqCst) == INITIALIZING {}
+                Err(SetLoggerError(()))
+            }
+            _ => Err(SetLoggerError(())),
         }
-
-        LOGGER = make_logger();
-        STATE.store(INITIALIZED, Ordering::SeqCst);
-        Ok(())
     }
 }