Merge pull request #232 from CarterLi/master

Improve local-ip detection on macOS and print vulkan detection failing reason

Author: LinusDierheimer

src/common/library.h

@@ -30,6 +30,9 @@
 #define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
     __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
 
+#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
+    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
+
 #define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, varName.ff ## symbolName, symbolName, returnValue);
 

src/detection/vulkan.c

@@ -33,14 +33,14 @@ static void applyDriverName(VkPhysicalDeviceDriverProperties* properties, FFstrb
     ffStrbufAppendC(result, ']');
 }
 
-static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
+static const char* detectVulkan(const FFinstance* instance, FFVulkanResult* result)
 {
-    FF_LIBRARY_LOAD(vulkan, instance->config.libVulkan, , "libvulkan"FF_LIBRARY_EXTENSION, 2)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkGetInstanceProcAddr,)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkCreateInstance,)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkDestroyInstance,)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkEnumeratePhysicalDevices,)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkGetPhysicalDeviceProperties,)
+    FF_LIBRARY_LOAD(vulkan, instance->config.libVulkan, "dlopen libvulkan"FF_LIBRARY_EXTENSION " failed", "libvulkan"FF_LIBRARY_EXTENSION, 2)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkGetInstanceProcAddr)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkCreateInstance)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkDestroyInstance)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkEnumeratePhysicalDevices)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkGetPhysicalDeviceProperties)
 
     //Some drivers (nvdc) print messages to stdout
     //and thats the best way i found to disable that
@@ -102,7 +102,7 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
     {
         dlclose(vulkan);
         ffSuppressIO(false);
-        return;
+        return "ffvkCreateInstance() failed";
     }
 
 
@@ -117,7 +117,7 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
         ffvkDestroyInstance(vkInstance, NULL);
         dlclose(vulkan);
         ffSuppressIO(false);
-        return;
+        return "ffvkEnumeratePhysicalDevices() failed";
     }
 
     VkPhysicalDevice* physicalDevices = malloc(sizeof(VkPhysicalDevice) * physicalDeviceCount);
@@ -127,7 +127,7 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
         ffvkDestroyInstance(vkInstance, NULL);
         dlclose(vulkan);
         ffSuppressIO(false);
-        return;
+        return "ffvkEnumeratePhysicalDevices() failed";
     }
 
     PFN_vkGetPhysicalDeviceProperties2 ffvkGetPhysicalDeviceProperties2 = (PFN_vkGetPhysicalDeviceProperties2) ffvkGetInstanceProcAddr(vkInstance, "vkGetPhysicalDeviceProperties2");
@@ -208,6 +208,7 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
     ffvkDestroyInstance(vkInstance, NULL);
     dlclose(vulkan);
     ffSuppressIO(false);
+    return NULL;
 }
 
 #endif
@@ -232,9 +233,10 @@ const FFVulkanResult* ffDetectVulkan(const FFinstance* instance)
     ffListInit(&result.gpus, sizeof(FFGPUResult));
 
     #ifdef FF_HAVE_VULKAN
-        detectVulkan(instance, &result);
+        result.error = detectVulkan(instance, &result);
     #else
         FF_UNUSED(instance);
+        result.error = "fastfetch was compiled without vulkan support";
     #endif
 
     pthread_mutex_unlock(&mutex);

src/detection/vulkan.h

@@ -11,6 +11,7 @@ typedef struct FFVulkanResult
     FFstrbuf apiVersion;
     FFstrbuf conformanceVersion;
     FFlist gpus; //List of FFGPUResult, see detection/gpu/gpu.h
+    const char* error;
 } FFVulkanResult;
 
 const FFVulkanResult* ffDetectVulkan(const FFinstance* instance);

src/modules/localip.c

@@ -5,6 +5,7 @@
 #define FF_LOCALIP_NUM_FORMAT_ARGS 1
 
 #include <string.h>
+#include <ctype.h>
 #include <ifaddrs.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -54,7 +55,7 @@ void ffPrintLocalIp(FFinstance* instance)
             continue;
 
         // loop back
-        if (strcmp(ifa->ifa_name, "lo") == 0 && !instance->config.localIpShowLoop)
+        if (strncmp(ifa->ifa_name, "lo", 2) == 0 && (ifa->ifa_name[2] == '\0' || isdigit(ifa->ifa_name[2])) && !instance->config.localIpShowLoop)
             continue;
 
         if (ifa->ifa_addr->sa_family == AF_INET) { // check it is IP4

src/modules/vulkan.c

@@ -9,9 +9,9 @@ void ffPrintVulkan(FFinstance* instance)
 {
     const FFVulkanResult* vulkan = ffDetectVulkan(instance);
 
-    if(vulkan->apiVersion.length == 0 && vulkan->driver.length == 0)
+    if(vulkan->error)
     {
-        ffPrintError(instance, FF_VULKAN_MODULE_NAME, 0, &instance->config.vulkan, "Failed to detect vulkan");
+        ffPrintError(instance, FF_VULKAN_MODULE_NAME, 0, &instance->config.vulkan, vulkan->error);
         return;
     }