Update to NSPR 4.9.5 Beta 2, part 2: actual changes.

mozilla/nsprpub/pr/src/threads/combined/pruthr.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "primpl.h"
 #include <signal.h>
 #include <string.h>
 
 #if defined(WIN95)                                                                         
@@ skipping 219 matching lines @@
     if (thread->privateData) {
         unsigned int i;
         for (i = 0; i < thread->tpdLength; i++) {
             PR_ASSERT(thread->privateData[i] == NULL);
         }
     }
 #endif
     PR_ASSERT(thread->dumpArg == 0 && thread->dump == 0);
     PR_ASSERT(thread->errorString == 0 && thread->errorStringSize == 0);
     PR_ASSERT(thread->errorStringLength == 0);
+    PR_ASSERT(thread->name == 0);
 
     /* Reset data members in thread structure */
     thread->errorCode = thread->osErrorCode = 0;
     thread->io_pending = thread->io_suspended = PR_FALSE;
     thread->environment = 0;
     PR_INIT_CLIST(&thread->lockList);
 }
 
 PRStatus _PR_RecycleThread(PRThread *thread)
 {
@@ skipping 1324 matching lines @@
     } else if ((PRIntn)newPri < (PRIntn)PR_PRIORITY_FIRST) {
         newPri = PR_PRIORITY_FIRST;
     }
         
     if ( _PR_IS_NATIVE_THREAD(thread) ) {
         thread->priority = newPri;
         _PR_MD_SET_PRIORITY(&(thread->md), newPri);
     } else _PR_SetThreadPriority(thread, newPri);
 }
 
+PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name)
+{
+    PRThread *thread;
+    size_t nameLen;
+
+    if (!name) {
+        PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
+        return PR_FAILURE;
+    }
+
+    thread = PR_GetCurrentThread();
+    if (!thread)
+        return PR_FAILURE;
+
+    PR_Free(thread->name);
+    nameLen = strlen(name);
+    thread->name = (char *)PR_Malloc(nameLen + 1);
+    if (!thread->name)
+        return PR_FAILURE;
+    memcpy(thread->name, name, nameLen + 1);
+    _PR_MD_SET_CURRENT_THREAD_NAME(thread->name);
+    return PR_SUCCESS;
+}
+
+PR_IMPLEMENT(const char *) PR_GetThreadName(const PRThread *thread)
+{
+    if (!thread)
+        return NULL;
+    return thread->name;
+}
+
 
 /*
 ** This routine prevents all other threads from running. This call is needed by 
 ** the garbage collector.
 */
 PR_IMPLEMENT(void) PR_SuspendAll(void)
 {
     PRThread *me = _PR_MD_CURRENT_THREAD();
     PRCList *qp;
 
@@ skipping 252 matching lines @@
     _PR_RUNQ_LOCK(cpu);
     _PR_ADD_RUNQ(thread, cpu, pri);
     _PR_RUNQ_UNLOCK(cpu);
     if (!_PR_IS_NATIVE_THREAD(me) && (cpu == me->cpu)) {
         if (pri > me->priority) {
             _PR_SET_RESCHED_FLAG();
         }
     }
 #endif
 }