f

Author: TheBlueMatt

lightning/src/debug_sync.rs

@@ -105,31 +105,34 @@ impl LockMetadata {
 		#[cfg(feature = "backtrace")]
 		{
 			let mut ip = None;
-			// Find the first frame which was *not* in debug_sync (or which is in our tests) and
-			// use that as the mutex construction site. The second frame should always be in
-			// debug_sync (the first may be in Backtrace itself).
+			// Find the first frame which is after `debug_sync` (or which is in our tests) and use
+			// that as the mutex construction site. Note that the first few frames may be in
+			// `backtrace`, so we have to ignore those.
 			let sync_mutex_constr_regex = regex::Regex::new(r"lightning.*debug_sync.*new").unwrap();
 for frame in backtrace.frames() {
 	for symbol in frame.symbols() {
 		eprint!("{} ", symbol.name().unwrap().as_str().unwrap());
 	}
 	eprintln!("- {:p}", frame.ip());
 }
-			assert!(sync_mutex_constr_regex.is_match(backtrace.frames()[0].symbols().last().unwrap().name().unwrap().as_str().unwrap()) ||
-				sync_mutex_constr_regex.is_match(backtrace.frames()[1].symbols().last().unwrap().name().unwrap().as_str().unwrap()) ||
-				sync_mutex_constr_regex.is_match(backtrace.frames().get(2).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")) ||
-				sync_mutex_constr_regex.is_match(backtrace.frames().get(3).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")) ||
-				sync_mutex_constr_regex.is_match(backtrace.frames().get(4).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")) ||
-				sync_mutex_constr_regex.is_match(backtrace.frames().get(5).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")) ||
-				sync_mutex_constr_regex.is_match(backtrace.frames().get(6).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")),
-				"should contain lightning...debug_sync...new");
+assert!(sync_mutex_constr_regex.is_match(backtrace.frames()[0].symbols().last().unwrap().name().unwrap().as_str().unwrap()) ||
+	sync_mutex_constr_regex.is_match(backtrace.frames()[1].symbols().last().unwrap().name().unwrap().as_str().unwrap()) ||
+	sync_mutex_constr_regex.is_match(backtrace.frames().get(2).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")) ||
+	sync_mutex_constr_regex.is_match(backtrace.frames().get(3).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")) ||
+	sync_mutex_constr_regex.is_match(backtrace.frames().get(4).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")) ||
+	sync_mutex_constr_regex.is_match(backtrace.frames().get(5).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")) ||
+	sync_mutex_constr_regex.is_match(backtrace.frames().get(6).map(|f| f.symbols().last().unwrap().name().unwrap().as_str().unwrap()).unwrap_or("")),
+	"should contain lightning...debug_sync...new");
+			let mut found_debug_sync = false;
 			for frame in backtrace.frames() {
 				let symbol_name = frame.symbols().last().unwrap().name().unwrap().as_str().unwrap();
 				if !sync_mutex_constr_regex.is_match(symbol_name) {
+					if found_debug_sync {
 eprintln!("Picked framepointer {:p}", frame.ip());
-					ip = Some(frame.ip() as usize as u64);
-					break;
-				}
+						ip = Some(frame.ip() as usize as u64);
+						break;
+					}
+				} else { found_debug_sync = true; }
 			}
 			lock_idx = ip.unwrap();
 			LOCKS_INIT.call_once(|| { unsafe { LOCKS = Some(StdMutex::new(HashMap::new())); } });