Add viewer watchdog process to notice crashes and report.

.github/workflows/build.yaml

@@ -108,7 +108,7 @@ jobs:
           path: .master-message-template
 
       - name: Install autobuild and python dependencies
-        run: pip3 install autobuild llsd
+        run: pip3 install autobuild llsd PyInstaller
 
       - name: Cache autobuild packages
         id: cache-installables
@@ -308,13 +308,18 @@ jobs:
     steps:
       - name: Sign and package Windows viewer
         if: env.AZURE_KEY_VAULT_URI && env.AZURE_CERT_NAME && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET && env.AZURE_TENANT_ID
-        uses: secondlife/viewer-build-util/sign-pkg-windows@v2
+        uses: secondlife/viewer-build-util/sign-pkg-windows@project/watchdog
         with:
           vault_uri: "${{ env.AZURE_KEY_VAULT_URI }}"
           cert_name: "${{ env.AZURE_CERT_NAME }}"
           client_id: "${{ env.AZURE_CLIENT_ID }}"
           client_secret: "${{ env.AZURE_CLIENT_SECRET }}"
           tenant_id: "${{ env.AZURE_TENANT_ID }}"
+          files: |
+            SecondLifeViewer.exe
+            SLVersionChecker.exe
+            watchdog.exe
+            llplugin/dullahan_host.exe
 
   sign-and-package-mac:
     env:
@@ -347,7 +352,7 @@ jobs:
 
       - name: Sign and package Mac viewer
         if: env.SIGNING_CERT_MACOS && env.SIGNING_CERT_MACOS_IDENTITY && env.SIGNING_CERT_MACOS_PASSWORD && steps.note-creds.outputs.note_user && steps.note-creds.outputs.note_pass && steps.note-creds.outputs.note_team
-        uses: secondlife/viewer-build-util/sign-pkg-mac@v2
+        uses: secondlife/viewer-build-util/sign-pkg-mac@project/watchdog
         with:
           channel: ${{ needs.build.outputs.viewer_channel }}
           imagename: ${{ needs.build.outputs.imagename }}
@@ -357,6 +362,15 @@ jobs:
           note_user: ${{ steps.note-creds.outputs.note_user }}
           note_pass: ${{ steps.note-creds.outputs.note_pass }}
           note_team: ${{ steps.note-creds.outputs.note_team }}
+          apps:
+            Contents/Resources/updater/SLVersionChecker
+            Contents/Resources/SLPlugin.app/Contents/MacOS/SLPlugin
+            Contents/Resources/SLVoice
+            Contents/Resources/watchdog
+          files:
+            Contents/Resources/*.dylib
+            Contents/Resources/llplugin/*.dylib
+            "Contents/Frameworks/Chromium Embedded Framework.framework/Libraries"/*.dylib
 
   post-windows-symbols:
     env:
@@ -376,11 +390,18 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: Windows-symbols
+          path: _artifacts
       - name: Extract viewer pdb
         if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
         shell: bash
         run: |
-          tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.xz" -C _artifacts
+          cd _artifacts
+          # 2025-02-04: Bug in GitHub runner machinery? The viewer_channel
+          # written by the build job as 'Second Life Project Watchdog' is
+          # being read here as 'Second Life Project watchdog', and
+          # empirically, that's enough difference to make this tar command
+          # fail. Trust that there's only one *.sym.tar.xz in this directory.
+          tar -xJf *.sym.tar.xz
       - name: Post Windows symbols
         if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
         uses: secondlife-3p/symbol-upload@v10

indra/CMakeLists.txt

@@ -71,6 +71,7 @@ endif (NOT USE_BUGSPLAT)
 add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
 add_subdirectory(${LIBS_OPEN_PREFIX}llui)
 add_subdirectory(${LIBS_OPEN_PREFIX}viewer_components)
+add_subdirectory(${VIEWER_PREFIX}watchdog)
 
 if( LL_TESTS )
 # Legacy C++ tests. Build always, run if LL_TESTS is true.

indra/lib/python/indra/util/llmanifest.py

@@ -37,6 +37,7 @@
 import itertools
 import operator
 import os
+from pathlib import Path
 import re
 import shlex
 import shutil
@@ -57,23 +58,18 @@ def __init__(self, msg):
         super(MissingError, self).__init__(self.msg)
 
 def path_ancestors(path):
-    drive, path = os.path.splitdrive(os.path.normpath(path))
-    result = []
-    while len(path) > 0 and path != os.path.sep:
-        result.append(drive+path)
-        path, sub = os.path.split(path)
-    return result
+    return Path(path).parents
 
 def proper_windows_path(path, current_platform = sys.platform):
     """ This function takes an absolute Windows or Cygwin path and
     returns a path appropriately formatted for the platform it's
     running on (as determined by sys.platform)"""
-    path = path.strip()
+    path = str(path).strip()
     drive_letter = None
     rel = None
     match = re.match("/cygdrive/([a-z])/(.*)", path)
     if not match:
-        match = re.match('([a-zA-Z]):\\\(.*)', path)
+        match = re.match(r'([a-zA-Z]):\\\(.*)', path)
     if not match:
         return None         # not an absolute path
     drive_letter = match.group(1)
@@ -309,7 +305,7 @@ def main(extra=[]):
 class LLManifestRegistry(type):
     def __init__(cls, name, bases, dct):
         super(LLManifestRegistry, cls).__init__(name, bases, dct)
-        match = re.match("(\w+)Manifest", name)
+        match = re.match(r"(\w+)Manifest", name)
         if match:
            cls.manifests[match.group(1).lower()] = cls
 
@@ -391,10 +387,10 @@ def prefix(self, src='', build='', dst='', src_dst=None):
         if src_dst is not None:
             src = src_dst
             dst = src_dst
-        self.src_prefix.append(src)
-        self.artwork_prefix.append(src)
-        self.build_prefix.append(build)
-        self.dst_prefix.append(dst)
+        self.src_prefix.append(str(src))
+        self.artwork_prefix.append(str(src))
+        self.build_prefix.append(str(build))
+        self.dst_prefix.append(str(dst))
 
 ##      self.display_stacks()
 
@@ -551,7 +547,7 @@ def created_path(self, path):
           b) schedule it for cleanup"""
         if not os.path.exists(path):
             raise ManifestError("Should be something at path " + path)
-        self.created_paths.append(path)
+        self.created_paths.append(str(path))
 
     def put_in_file(self, contents, dst, src=None):
         # write contents as dst
@@ -583,7 +579,7 @@ def copy_action(self, src, dst):
         if src and (os.path.exists(src) or os.path.islink(src)):
             # ensure that destination path exists
             self.cmakedirs(os.path.dirname(dst))
-            self.created_paths.append(dst)
+            self.created_paths.append(str(dst))
             self.ccopymumble(src, dst)
         else:
             print("Doesn't exist:", src)
@@ -663,7 +659,7 @@ def process_file(self, src, dst):
                 method = getattr(self, methodname, None)
                 if method is not None:
                     method(src, dst)
-            self.file_list.append([src, dst])
+            self.file_list.append([str(src), str(dst)])
             return 1
         else:
             sys.stdout.write(" (excluding %r, %r)" % (src, dst))
@@ -795,11 +791,11 @@ def contents_of_tar(self, src_tar, dst_dir):
 
     def wildcard_regex(self, src_glob, dst_glob):
         src_re = re.escape(src_glob)
-        src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]*)')
+        src_re = src_re.replace(r'\*', '([-a-zA-Z0-9._ ]*)')
         dst_temp = dst_glob
         i = 1
         while dst_temp.count("*") > 0:
-            dst_temp = dst_temp.replace('*', '\g<' + str(i) + '>', 1)
+            dst_temp = dst_temp.replace('*', r'\g<' + str(i) + '>', 1)
             i = i+1
         return re.compile(src_re), dst_temp
 

indra/llcommon/CMakeLists.txt

@@ -310,7 +310,7 @@ if (LL_TESTS)
   LL_ADD_INTEGRATION_TEST(llframetimer "" "${test_libs}")
   LL_ADD_INTEGRATION_TEST(llheteromap "" "${test_libs}")
   LL_ADD_INTEGRATION_TEST(llinstancetracker "" "${test_libs}")
-  LL_ADD_INTEGRATION_TEST(llleap "" "${test_libs}")
+  LL_ADD_INTEGRATION_TEST(llleap "" "${test_libs}") ## lldb -b -o run -k bt)
   LL_ADD_INTEGRATION_TEST(llmainthreadtask "" "${test_libs}")
   LL_ADD_INTEGRATION_TEST(llpounceable "" "${test_libs}")
   LL_ADD_INTEGRATION_TEST(llprocess "" "${test_libs}")

indra/llcommon/llcallbacklist.cpp

@@ -68,14 +68,7 @@ bool LLCallbackList::containsFunction( callback_t func, void *data)
 {
     callback_pair_t t(func, data);
     callback_list_t::iterator iter = find(func,data);
-    if (iter != mCallbackList.end())
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
+    return (iter != mCallbackList.end());
 }
 
 
@@ -84,7 +77,10 @@ bool LLCallbackList::deleteFunction( callback_t func, void *data)
     callback_list_t::iterator iter = find(func,data);
     if (iter != mCallbackList.end())
     {
-        mCallbackList.erase(iter);
+        // Don't (yet) erase the list entry because we might be indirectly
+        // called by a traversal of this same list. Defer removal until a
+        // subsequent traversal.
+        iter->first = nullptr;
         return true;
     }
     else
@@ -111,8 +107,16 @@ void LLCallbackList::callFunctions()
 {
     for (callback_list_t::iterator iter = mCallbackList.begin(); iter != mCallbackList.end(); )
     {
-        callback_list_t::iterator curiter = iter++;
-        curiter->first(curiter->second);
+        if (! iter->first)
+        {
+            // entry previously marked for deletion by deleteFunction()
+            iter = mCallbackList.erase(iter);
+        }
+        else
+        {
+            auto curiter = iter++;
+            curiter->first(curiter->second);
+        }
     }
 }
 

indra/llcommon/llcallbacklist.h

@@ -49,6 +49,7 @@ class LLCallbackList
     bool deleteFunction( callback_t func, void *data = NULL );      // removes the first instance of this function/data pair from the list, false if not found
     void callFunctions();                                                       // calls all functions
     void deleteAllFunctions();
+    bool empty() const { return mCallbackList.empty(); }
 
     static void test();