|
1 | | -package ojdmcollector |
2 | | - |
3 | | -import ( |
4 | | - "fmt" |
5 | | - "sort" |
6 | | -) |
7 | | - |
8 | | -func CollectJavaInfo(searchPaths []string) []JavaInfoRunningProcs { |
9 | | - |
10 | | - var javaInfos []JavaInfoRunningProcs |
11 | | - var versionInfos []JavaInfoRunningProcs |
12 | | - javaBasePAths := getJavaSharedLibPaths(searchPaths) |
13 | | - |
14 | | - versionInfos = GetJavaVersionInfos(javaBasePAths) |
15 | | - sort.Slice(versionInfos, func(i, j int) bool { |
16 | | - return versionInfos[i].JavaVersion > versionInfos[j].JavaVersion |
17 | | - }) |
18 | | - |
19 | | - var toolFound *JavaInfoRunningProcs |
20 | | - for _, info := range versionInfos { |
21 | | - if info.JpsJinfoPresent { |
22 | | - toolFound = &info |
23 | | - break |
24 | | - } |
25 | | - } |
26 | | - |
27 | | - if toolFound != nil { |
28 | | - javaProcesses := GetJavaProcessInfo(toolFound.JavaHome) |
29 | | - javaInfos = append(javaInfos, javaProcesses...) |
30 | | - } else { |
31 | | - fmt.Println("Did not find the jinfo and jps binaries, running processes will not be identified.") |
32 | | - } |
33 | | - |
34 | | - mergedJavaInfo := mergeSlices(javaInfos, versionInfos) |
35 | | - |
36 | | - return mergedJavaInfo |
37 | | -} |
38 | | - |
39 | | -func mergeSlices(processInfo, versionInfo []JavaInfoRunningProcs) []JavaInfoRunningProcs { |
40 | | - mergedSlice := make([]JavaInfoRunningProcs, 0) |
41 | | - versionMap := make(map[string]*JavaInfoRunningProcs) |
42 | | - processMap := make(map[string]bool) |
43 | | - |
44 | | - // Create a map from versionInfo |
45 | | - for i, vInfoItem := range versionInfo { |
46 | | - normalizedJavaHome := normalizePath(vInfoItem.JavaHome) |
47 | | - versionMap[normalizedJavaHome] = &versionInfo[i] |
48 | | - } |
49 | | - |
50 | | - // Iterate over processInfo and merge or add unique items |
51 | | - for _, pInfoItem := range processInfo { |
52 | | - normalizedJavaHome := normalizePath(pInfoItem.JavaHome) |
53 | | - if vInfoItem, exists := versionMap[normalizedJavaHome]; exists { |
54 | | - // Merge with versionInfo item |
55 | | - mergedItem := *vInfoItem |
56 | | - mergedItem.ProcessRunning = pInfoItem.ProcessRunning |
57 | | - mergedItem.ProcessPath = pInfoItem.ProcessPath |
58 | | - mergedItem.CommandLine = pInfoItem.CommandLine |
59 | | - mergedSlice = append(mergedSlice, mergedItem) |
60 | | - |
61 | | - // Mark as processed |
62 | | - processMap[normalizedJavaHome] = true |
63 | | - } else { |
64 | | - // Add unique processInfo item |
65 | | - mergedSlice = append(mergedSlice, pInfoItem) |
66 | | - } |
67 | | - } |
68 | | - |
69 | | - // Add any versionInfo items that weren't merged |
70 | | - for _, vInfoItem := range versionInfo { |
71 | | - normalizedJavaHome := normalizePath(vInfoItem.JavaHome) |
72 | | - if !processMap[normalizedJavaHome] { |
73 | | - mergedSlice = append(mergedSlice, vInfoItem) |
74 | | - } |
75 | | - } |
76 | | - |
77 | | - return mergedSlice |
78 | | -} |
| 1 | +package ojdmcollector |
| 2 | + |
| 3 | +import ( |
| 4 | + "fmt" |
| 5 | + "sort" |
| 6 | +) |
| 7 | + |
| 8 | +func CollectJavaInfo(searchPaths []string) []JavaInfoRunningProcs { |
| 9 | + |
| 10 | + var javaInfos []JavaInfoRunningProcs |
| 11 | + var versionInfos []JavaInfoRunningProcs |
| 12 | + javaBasePAths := getJavaSharedLibPaths(searchPaths) |
| 13 | + |
| 14 | + versionInfos = GetJavaVersionInfos(javaBasePAths) |
| 15 | + sort.Slice(versionInfos, func(i, j int) bool { |
| 16 | + return versionInfos[i].JavaVersion > versionInfos[j].JavaVersion |
| 17 | + }) |
| 18 | + |
| 19 | + var toolFound *JavaInfoRunningProcs |
| 20 | + for _, info := range versionInfos { |
| 21 | + if info.JpsJinfoPresent { |
| 22 | + toolFound = &info |
| 23 | + break |
| 24 | + } |
| 25 | + } |
| 26 | + |
| 27 | + if toolFound != nil { |
| 28 | + javaProcesses := GetJavaProcessInfo(toolFound.JavaHome) |
| 29 | + javaInfos = append(javaInfos, javaProcesses...) |
| 30 | + } else { |
| 31 | + fmt.Println("Did not find the jinfo and jps binaries, running processes will not be identified.") |
| 32 | + } |
| 33 | + |
| 34 | + mergedJavaInfo := mergeSlices(javaInfos, versionInfos) |
| 35 | + |
| 36 | + return mergedJavaInfo |
| 37 | +} |
| 38 | + |
| 39 | +func mergeSlices(processInfo, versionInfo []JavaInfoRunningProcs) []JavaInfoRunningProcs { |
| 40 | + mergedSlice := make([]JavaInfoRunningProcs, 0) |
| 41 | + versionMap := make(map[string]*JavaInfoRunningProcs) |
| 42 | + processMap := make(map[string]bool) |
| 43 | + |
| 44 | + // Create a map from versionInfo |
| 45 | + for i, vInfoItem := range versionInfo { |
| 46 | + normalizedJavaHome := normalizePath(vInfoItem.JavaHome) |
| 47 | + versionMap[normalizedJavaHome] = &versionInfo[i] |
| 48 | + } |
| 49 | + |
| 50 | + // Iterate over processInfo and merge or add unique items |
| 51 | + for _, pInfoItem := range processInfo { |
| 52 | + normalizedJavaHome := normalizePath(pInfoItem.JavaHome) |
| 53 | + if vInfoItem, exists := versionMap[normalizedJavaHome]; exists { |
| 54 | + // Merge with versionInfo item |
| 55 | + mergedItem := *vInfoItem |
| 56 | + mergedItem.ProcessRunning = pInfoItem.ProcessRunning |
| 57 | + mergedItem.ProcessPath = pInfoItem.ProcessPath |
| 58 | + mergedItem.CommandLine = pInfoItem.CommandLine |
| 59 | + mergedSlice = append(mergedSlice, mergedItem) |
| 60 | + |
| 61 | + // Mark as processed |
| 62 | + processMap[normalizedJavaHome] = true |
| 63 | + } else { |
| 64 | + // Add unique processInfo item |
| 65 | + mergedSlice = append(mergedSlice, pInfoItem) |
| 66 | + } |
| 67 | + } |
| 68 | + |
| 69 | + // Add any versionInfo items that weren't merged |
| 70 | + for _, vInfoItem := range versionInfo { |
| 71 | + normalizedJavaHome := normalizePath(vInfoItem.JavaHome) |
| 72 | + if !processMap[normalizedJavaHome] { |
| 73 | + mergedSlice = append(mergedSlice, vInfoItem) |
| 74 | + } |
| 75 | + } |
| 76 | + |
| 77 | + return mergedSlice |
| 78 | +} |
0 commit comments