From: Sangwook Kim <swift.kim@samsung.com>
Date: Wed, 22 Apr 2020 09:01:00 +0000 (+0900)
Subject: [Tizen] Search symbol directories recursively (#27)
X-Git-Tag: submit/tizen_5.5/20200504.045052~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b5be46aad8b46ee9ef9aa7a0371509102869f7d;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git

[Tizen] Search symbol directories recursively (#27)

The SOS command 'setsymbolserver -directory' will automatically search
all subdirectories of the specified directory.
---

diff --git a/src/SOS/SOS.NETCore/SymbolReader.cs b/src/SOS/SOS.NETCore/SymbolReader.cs
index b7af5278a..15dccdbf4 100644
--- a/src/SOS/SOS.NETCore/SymbolReader.cs
+++ b/src/SOS/SOS.NETCore/SymbolReader.cs
@@ -1183,9 +1183,19 @@ namespace SOS
             {
                 symbolDirectoryPath = Path.GetFullPath(symbolDirectoryPath);
 
-                if (!IsDuplicateSymbolStore<DirectorySymbolStore>(store, (directorySymbolStore) => IsPathEqual(symbolDirectoryPath, directorySymbolStore.Directory)))
+                var probingPaths = new List<string> { symbolDirectoryPath };
+                if (Directory.Exists(symbolDirectoryPath))
                 {
-                    store = new DirectorySymbolStore(s_tracer, store, symbolDirectoryPath);
+                    // Add all subdirectories.
+                    probingPaths.AddRange(Directory.GetDirectories(symbolDirectoryPath, "*", SearchOption.AllDirectories));
+                }
+                // Make sure the root directory is enumerated last so that it comes first in the fallback tree.
+                foreach (var path in Enumerable.Reverse(probingPaths))
+                {
+                    if (!IsDuplicateSymbolStore<DirectorySymbolStore>(store, (directorySymbolStore) => IsPathEqual(path, directorySymbolStore.Directory)))
+                    {
+                        store = new DirectorySymbolStore(s_tracer, store, path);
+                    }
                 }
             }