Refactor: move threading functions to init

CMakeLists.txt

@@ -138,7 +138,6 @@ add_library(libfastfetch OBJECT
     src/util/FFlist.c
     src/util/FFvaluestore.c
     src/common/init.c
-    src/common/threading.c
     src/common/io.c
     src/common/printing.c
     src/common/caching.c

src/common/init.c

@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <signal.h>
+#include <pthread.h>
 
 static bool strbufEqualsAdapter(const void* first, const void* second)
 {
@@ -137,6 +138,7 @@ static void defaultConfig(FFinstance* instance)
     instance->config.escapeBedrock = true;
     instance->config.glType = FF_GL_TYPE_AUTO;
     instance->config.pipe = false;
+    instance->config.multithreading = true;
 
     initModuleArg(&instance->config.os);
     initModuleArg(&instance->config.host);
@@ -219,6 +221,75 @@ void ffInitInstance(FFinstance* instance)
     defaultConfig(instance);
 }
 
+static inline void* detectPlasmaThreadMain(void* instance)
+{
+    ffDetectQt((FFinstance*)instance);
+    return NULL;
+}
+
+static inline void* detectGTK2ThreadMain(void* instance)
+{
+    ffDetectGTK2((FFinstance*)instance);
+    return NULL;
+}
+
+static inline void* detectGTK3ThreadMain(void* instance)
+{
+    ffDetectGTK3((FFinstance*)instance);
+    return NULL;
+}
+
+static inline void* detectGTK4ThreadMain(void* instance)
+{
+    ffDetectGTK4((FFinstance*)instance);
+    return NULL;
+}
+
+static inline void* connectDisplayServerThreadMain(void* instance)
+{
+    ffConnectDisplayServer((FFinstance*)instance);
+    return NULL;
+}
+
+static inline void* startThreadsThreadMain(void* instance)
+{
+    pthread_t dsThread;
+    pthread_create(&dsThread, NULL, connectDisplayServerThreadMain, instance);
+    pthread_detach(dsThread);
+
+    pthread_t gtk2Thread;
+    pthread_create(&gtk2Thread, NULL, detectGTK2ThreadMain, instance);
+    pthread_detach(gtk2Thread);
+
+    pthread_t gtk3Thread;
+    pthread_create(&gtk3Thread, NULL, detectGTK3ThreadMain, instance);
+    pthread_detach(gtk3Thread);
+
+    pthread_t gtk4Thread;
+    pthread_create(&gtk4Thread, NULL, detectGTK4ThreadMain, instance);
+    pthread_detach(gtk4Thread);
+
+    pthread_t plasmaThread;
+    pthread_create(&plasmaThread, NULL, detectPlasmaThreadMain, instance);
+    pthread_detach(plasmaThread);
+
+    return NULL;
+}
+
+void startDetectionThreads(FFinstance* instance)
+{
+    //Android needs none of the things that are detected here
+    //And using gsettings sometimes hangs the program in android for some unknown reason,
+    //and since we don't need it we just never call it.
+    #ifdef __ANDROID__
+        return;
+    #endif
+
+    pthread_t startThreadsThread;
+    pthread_create(&startThreadsThread, NULL, startThreadsThreadMain, instance);
+    pthread_detach(startThreadsThread);
+}
+
 static volatile bool ffDisableLinewrap = true;
 static volatile bool ffHideCursor = true;
 
@@ -240,6 +311,9 @@ static void exitSignalHandler(int signal)
 
 void ffStart(FFinstance* instance)
 {
+    if(instance->config.multithreading)
+        startDetectionThreads(instance);
+
     ffDisableLinewrap = instance->config.disableLinewrap && !instance->config.pipe;
     ffHideCursor = instance->config.hideCursor && !instance->config.pipe;
 

src/common/threading.c

@@ -1,72 +0,0 @@
-#include "fastfetch.h"
-
-#include <pthread.h>
-
-static inline void* detectPlasmaThreadMain(void* instance)
-{
-    ffDetectQt((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* detectGTK2ThreadMain(void* instance)
-{
-    ffDetectGTK2((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* detectGTK3ThreadMain(void* instance)
-{
-    ffDetectGTK3((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* detectGTK4ThreadMain(void* instance)
-{
-    ffDetectGTK4((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* connectDisplayServerThreadMain(void* instance)
-{
-    ffConnectDisplayServer((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* startThreadsThreadMain(void* instance)
-{
-    pthread_t dsThread;
-    pthread_create(&dsThread, NULL, connectDisplayServerThreadMain, instance);
-    pthread_detach(dsThread);
-
-    pthread_t gtk2Thread;
-    pthread_create(&gtk2Thread, NULL, detectGTK2ThreadMain, instance);
-    pthread_detach(gtk2Thread);
-
-    pthread_t gtk3Thread;
-    pthread_create(&gtk3Thread, NULL, detectGTK3ThreadMain, instance);
-    pthread_detach(gtk3Thread);
-
-    pthread_t gtk4Thread;
-    pthread_create(&gtk4Thread, NULL, detectGTK4ThreadMain, instance);
-    pthread_detach(gtk4Thread);
-
-    pthread_t plasmaThread;
-    pthread_create(&plasmaThread, NULL, detectPlasmaThreadMain, instance);
-    pthread_detach(plasmaThread);
-
-    return NULL;
-}
-
-void ffStartDetectionThreads(FFinstance* instance)
-{
-    //Android needs none of the things that are detected here
-    //And using gsettings sometimes hangs the program in android for some unknown reason,
-    //and since we don't need it we just never call it.
-    #ifdef __ANDROID__
-        return;
-    #endif
-
-    pthread_t startThreadsThread;
-    pthread_create(&startThreadsThread, NULL, startThreadsThreadMain, instance);
-    pthread_detach(startThreadsThread);
-}

src/fastfetch.c

@@ -12,7 +12,6 @@ typedef struct FFdata
 {
     FFvaluestore valuestore;
     FFstrbuf structure;
-    bool multithreading;
     bool loadUserConfig;
 } FFdata;
 
@@ -752,7 +751,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
     else if(strcasecmp(key, "--load-config") == 0)
         optionParseConfigFile(instance, data, key, value);
     else if(strcasecmp(key, "--multithreading") == 0)
-        data->multithreading = optionParseBoolean(value);
+        instance->config.multithreading = optionParseBoolean(value);
     else if(strcasecmp(key, "--allow-slow-operations") == 0)
         instance->config.allowSlowOperations = optionParseBoolean(value);
     else if(strcasecmp(key, "--escape-bedrock") == 0)
@@ -1374,17 +1373,12 @@ int main(int argc, const char** argv)
     FFdata data;
     ffValuestoreInit(&data.valuestore);
     ffStrbufInitA(&data.structure, 256);
-    data.multithreading = true;
     data.loadUserConfig = true;
 
     parseConfigFileSystem(&instance, &data);
     parseConfigFileUser(&instance, &data);
     parseArguments(&instance, &data, argc, argv);
 
-    //Start detection threads
-    if(data.multithreading)
-        ffStartDetectionThreads(&instance);
-
     //If we don't have a custom structure, use the default one
     if(data.structure.length == 0)
         ffStrbufSetS(&data.structure, FASTFETCH_DATATEXT_STRUCTURE);

src/fastfetch.h

@@ -77,6 +77,7 @@ typedef struct FFconfig
     bool escapeBedrock;
     FFGLType glType;
     bool pipe; //disables logo and all escape sequences
+    bool multithreading;
 
     FFModuleArgs os;
     FFModuleArgs host;
@@ -311,7 +312,7 @@ typedef struct FFDateTimeResult
 } FFDateTimeResult;
 
 //////////////////////
-// Common functions //
+// Init functions //
 //////////////////////
 
 //common/init.c
@@ -321,9 +322,6 @@ void ffFinish(FFinstance* instance);
 
 void ffListFeatures();
 
-//common/threading.c
-void ffStartDetectionThreads(FFinstance* instance);
-
 ////////////////////
 // Logo functions //
 ////////////////////

src/flashfetch.c

@@ -10,10 +10,7 @@ int main(int argc, char** argv)
 
     //Modify instance.config here
 
-    //Multithreading --> better performance
-    ffStartDetectionThreads(&instance);
-
-    //Does things like disabling line wrap
+    //Does things like starting detection threads, disabling line wrap, etc
     ffStart(&instance);
 
     //Printing