WL#4896 "Performance Schema Net IO"

Miscellaneous crash-proofing

Author: cpowers

storage/perfschema/pfs.cc

@@ -4727,8 +4727,11 @@ static void set_socket_info_v1(PSI_socket *socket,
 
   /** Set socket thread owner */
   PFS_thread *thread= my_pthread_getspecific_ptr(PFS_thread*, THR_PFS);
+
   if (thread)
     pfs->m_thread_owner= thread;
+  else
+    pfs->m_thread_owner= NULL;
 
   /** Set socket descriptor */
   if (fd != NULL)

storage/perfschema/pfs_instr.cc

@@ -1403,6 +1403,7 @@ PFS_socket* create_socket(PFS_socket_class *klass, const void *identity)
           pfs->m_idle= false;
           pfs->m_socket_stat.reset();
           pfs->m_lock.dirty_to_allocated();
+          pfs->m_thread_owner= NULL;
           if (klass->is_singleton())
             klass->m_singleton= pfs;
           return pfs;
@@ -1435,11 +1436,14 @@ void destroy_socket(PFS_socket *pfs)
 
   /* Aggregate to SOCKET_SUMMARY_BY_INSTANCE and BY_EVENT_NAME */
   klass->m_socket_stat.m_io_stat.aggregate(&pfs->m_socket_stat.m_io_stat);
-  pfs->m_socket_stat.m_io_stat.reset();
+  pfs->m_socket_stat.reset();
 
   if (klass->is_singleton())
     klass->m_singleton= NULL;
 
+  pfs->m_thread_owner= NULL;
+  pfs->m_fd= 0;
+  pfs->m_addr_len= 0;
   pfs->m_lock.allocated_to_free();
 }
 

storage/perfschema/pfs_visitor.cc

@@ -232,12 +232,8 @@ void PFS_instance_iterator::visit_socket_instances(PFS_socket_class *klass,
     PFS_socket *pfs= sanitize_socket(klass->m_singleton);
     if (likely(pfs != NULL))
     {
-      if (likely(pfs->m_lock.is_populated())
-          && pfs->m_thread_owner != NULL)
-      {
-        if (pfs->m_thread_owner == thread)
-          visitor->visit_socket(pfs);
-      }
+      if (unlikely(pfs->m_thread_owner == thread))
+        visitor->visit_socket(pfs);
     }
   }
   else
@@ -248,11 +244,10 @@ void PFS_instance_iterator::visit_socket_instances(PFS_socket_class *klass,
 
     for ( ; pfs < pfs_last; pfs++)
     {
-      if (pfs->m_class == klass && pfs->m_lock.is_populated()
-           && pfs->m_thread_owner != NULL)
+      if (unlikely((pfs->m_class == klass) &&
+                   (pfs->m_thread_owner == thread)))
       {
-        if (pfs->m_thread_owner == thread)
-          visitor->visit_socket(pfs);
+        visitor->visit_socket(pfs);
       }
     }
   }