Backed out changeset af229d7b8c35 (bug 1947513) for causing build bustages.

Cargo.lock

@@ -5548,7 +5548,6 @@ name = "rsclientcerts"
 version = "0.1.0"
 dependencies = [
  "byteorder",
- "gecko-profiler",
  "pkcs11-bindings",
 ]
 

security/manager/ssl/osclientcerts/src/lib.rs

@@ -130,7 +130,7 @@ extern "C" fn C_Initialize(_pInitArgs: CK_VOID_PTR) -> CK_RV {
         vec![CKM_ECDSA, CKM_RSA_PKCS]
     };
     let mut module_state_guard = try_to_get_module_state_guard!();
-    let manager_proxy = match ManagerProxy::new("osclientcerts", Backend {}) {
+    let manager_proxy = match ManagerProxy::new(Backend {}) {
         Ok(p) => p,
         Err(e) => {
             log_with_thread_id!(error, "C_Initialize: ManagerProxy: {}", e);

security/manager/ssl/rsclientcerts/Cargo.toml

@@ -7,5 +7,4 @@ license = "MPL-2.0"
 
 [dependencies]
 byteorder = "1.3"
-gecko-profiler = { path = "../../../../tools/profiler/rust-api" }
 pkcs11-bindings = "0.1"

security/manager/ssl/rsclientcerts/src/manager.rs

@@ -120,14 +120,12 @@ pub struct ManagerProxy {
 }
 
 impl ManagerProxy {
-    pub fn new<B: ClientCertsBackend + Send + 'static>(
-        name: &'static str,
-        backend: B,
-    ) -> Result<ManagerProxy, Error> {
+    pub fn new<B: ClientCertsBackend + Send + 'static>(backend: B) -> Result<ManagerProxy, Error> {
         let (proxy_sender, manager_receiver) = channel();
         let (manager_sender, proxy_receiver) = channel();
-        let thread_handle = thread::Builder::new().name(name.into()).spawn(move || {
-            gecko_profiler::register_thread(name);
+        let thread_handle = thread::Builder::new()
+            .name("osclientcert".into())
+            .spawn(move || {
                 let mut real_manager = Manager::new(backend);
                 while let Ok(arguments) = manager_receiver.recv() {
                     let results = match arguments {
@@ -135,7 +133,9 @@ impl ManagerProxy {
                             ManagerReturnValue::OpenSession(real_manager.open_session(slot_type))
                         }
                         ManagerArguments::CloseSession(session_handle) => {
-                        ManagerReturnValue::CloseSession(real_manager.close_session(session_handle))
+                            ManagerReturnValue::CloseSession(
+                                real_manager.close_session(session_handle),
+                            )
                         }
                         ManagerArguments::CloseAllSessions(slot_type) => {
                             ManagerReturnValue::CloseAllSessions(
@@ -143,7 +143,9 @@ impl ManagerProxy {
                             )
                         }
                         ManagerArguments::StartSearch(session, attrs) => {
-                        ManagerReturnValue::StartSearch(real_manager.start_search(session, attrs))
+                            ManagerReturnValue::StartSearch(
+                                real_manager.start_search(session, attrs),
+                            )
                         }
                         ManagerArguments::Search(session, max_objects) => {
                             ManagerReturnValue::Search(real_manager.search(session, max_objects))
@@ -182,7 +184,6 @@ impl ManagerProxy {
                         break;
                     }
                 }
-            gecko_profiler::unregister_thread();
             });
         match thread_handle {
             Ok(thread_handle) => Ok(ManagerProxy {