Add new hooks to provide some WUT features like malloc wrapping, sd card access or using of std::threads

Updated the example plugins

plugins/example_plugin/makefile.mk

@@ -2,7 +2,7 @@
 TARGET              := $(notdir $(CURDIR)).mod
 
 # Source directories
-SOURCES             := src
+SOURCES             := src src/utils
 
 # Data directories
 DATA                :=	
@@ -31,7 +31,7 @@ LIBDIRS             := $(WUPSDIR) $(WUT_ROOT) $(PORTLIBS)
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS                := -lwups -lwut
+LIBS                := -lwut -lwups 
 
 #---------------------------------------------------------------------------------
 # Will be added to the final lib paths

plugins/example_plugin/src/main.cpp

@@ -1,8 +1,11 @@
 #include <wups.h>
+#include <whb/libmanager.h>
 #include <malloc.h>
 #include <string.h>
 #include <nsysnet/socket.h>
 #include <utils/logger.h>
+#include <coreinit/time.h>
+#include <coreinit/thread.h>
 #include <coreinit/filesystem.h>
 
 /**
@@ -15,26 +18,31 @@ WUPS_PLUGIN_VERSION("v1.0");
 WUPS_PLUGIN_AUTHOR("Maschell");
 WUPS_PLUGIN_LICENSE("BSD");
 
-/**
-    Add this to one of your projects file to have access to SD/USB.
-**/
-WUPS_FS_ACCESS()
-/**
-    Add this to one of your projects file to be able to create overlays.
-**/
-WUPS_ALLOW_OVERLAY()
-
 /**
     All of this defines can be used in ANY file.
     It's possible to split it up into multiple files.
 
 **/
 
+
+/**
+
+WUPS_USE_WUT_MALLOC()       // Use the wut malloc wrapper
+WUPS_USE_WUT_NEWLIB()       // Use serveral function implementations
+WUPS_USE_WUT_DEVOPTAB()     // Use wut devoptab for SD access
+WUPS_USE_WUT_STDCPP()       // Use wut cpp wrappers
+
+WUPS_USE_WUT_CRT()          // Use all of them
+
+**/
+
+WUPS_USE_WUT_MALLOC()       // Use the wut malloc wrapper
+
 /**
     Get's called ONCE when the loader exits, but BEFORE the ON_APPLICATION_START gets called or functions are overridden.
 **/
 INITIALIZE_PLUGIN(){
-    socket_lib_init();
+    WHBInitializeSocketLibrary();
     log_init();
 	DEBUG_FUNCTION_LINE("INITIALIZE_PLUGIN of example_plugin!\n");
 }
@@ -43,9 +51,7 @@ INITIALIZE_PLUGIN(){
     Gets called when the plugin loader is re-entered => when the plugin is unloaded. 
 	The overridden functions are restored before this is getting called.
 **/
-DEINITIALIZE_PLUGIN(){
-    socket_lib_init();
-    log_init();
+DEINITIALIZE_PLUGIN(){   
     DEBUG_FUNCTION_LINE("DEINITIALIZE_PLUGIN of example_plugin!\n");
 }
 
@@ -55,7 +61,7 @@ DEINITIALIZE_PLUGIN(){
 	Make sure to initialize all functions you're using in the overridden functions!
 **/
 ON_APPLICATION_START(){
-    socket_lib_init();
+    WHBInitializeSocketLibrary();
     log_init();
 
     DEBUG_FUNCTION_LINE("ON_APPLICATION_START of example_plugin!\n");
@@ -64,35 +70,10 @@ ON_APPLICATION_START(){
 /**
     Gets called when an application ends. A good place for freeing memory.
 **/
-ON_APPLICATION_ENDING(){
+ON_APPLICATION_END(){
     DEBUG_FUNCTION_LINE("ON_APPLICATION_ENDING of example_plugin!\n");
 }
 
-/**
-    Gets called on each frame.
-**/
-ON_VYSNC(){
-    DEBUG_FUNCTION_LINE("ON_VYSNC of example_plugin!\n");
-}
-
-/**
-Gets called whenever the application status changes.
-
-Possible values of "status":
-    WUPS_APP_STATUS_FOREGROUND,         App is now running in foreground
-    WUPS_APP_STATUS_BACKGROUND          App is now running in background
-    WUPS_APP_STATUS_CLOSED              App is going to be closed
-**/
-ON_APP_STATUS_CHANGED(status){
-	if(status == WUPS_APP_STATUS_FOREGROUND){
-		DEBUG_FUNCTION_LINE("ON_APP_STATUS_CHANGED of example_plugin! App is now in foreground\n");
-	} else if(status == WUPS_APP_STATUS_BACKGROUND){
-		DEBUG_FUNCTION_LINE("ON_APP_STATUS_CHANGED of example_plugin! App is now in background\n");
-	} else if(status == WUPS_APP_STATUS_CLOSED){
-		DEBUG_FUNCTION_LINE("ON_APP_STATUS_CHANGED of example_plugin! App is now going to be closed\n");
-	}
-}
-
 /**
     This defines a function replacement.
     It allows to replace the system function with an own function. 

plugins/example_plugin/src/utils/logger.c

@@ -0,0 +1,82 @@
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <utils/logger.h>
+#include <nsysnet/socket.h>
+#include <coreinit/debug.h>
+
+#include <coreinit/systeminfo.h>
+#include <coreinit/thread.h>
+
+static int log_socket __attribute__((section(".data")))= -1;
+static struct sockaddr_in connect_addr __attribute__((section(".data")));
+static volatile int log_lock __attribute__((section(".data"))) = 0;
+
+void log_init_() {
+    int broadcastEnable = 1;
+    log_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if (log_socket < 0)
+        return;
+
+    setsockopt(log_socket, SOL_SOCKET, SO_BROADCAST, &broadcastEnable, sizeof(broadcastEnable));
+
+    memset(&connect_addr, 0, sizeof(struct sockaddr_in));
+    connect_addr.sin_family = AF_INET;
+    connect_addr.sin_port = 4405;
+    connect_addr.sin_addr.s_addr = htonl(INADDR_BROADCAST);
+}
+
+void log_print_(const char *str) {
+    // socket is always 0 initially as it is in the BSS
+    if(log_socket < 0) {
+        return;
+    }
+
+    while(log_lock)
+        OSSleepTicks(OSMicrosecondsToTicks(1000));
+    log_lock = 1;
+
+    int len = strlen(str);
+    int ret;
+    while (len > 0) {
+        int block = len < 1400 ? len : 1400; // take max 1400 bytes per UDP packet
+        ret = sendto(log_socket, str, block, 0, (struct sockaddr *)&connect_addr, sizeof(struct sockaddr_in));
+        if(ret < 0)
+            break;
+
+        len -= ret;
+        str += ret;
+    }
+
+    log_lock = 0;
+}
+
+void OSFatal_printf(const char *format, ...) {
+    char tmp[512];
+    tmp[0] = 0;
+    va_list va;
+    va_start(va, format);
+    if((vsprintf(tmp, format, va) >= 0)) {
+        OSFatal(tmp);
+    }
+    va_end(va);
+}
+
+void log_printf_(const char *format, ...) {
+    if(log_socket < 0) {
+        return;
+    }
+
+    char tmp[512];
+    tmp[0] = 0;
+
+    va_list va;
+    va_start(va, format);
+    if((vsprintf(tmp, format, va) >= 0)) {
+        log_print_(tmp);
+    }
+    va_end(va);
+}
+

plugins/example_plugin/src/utils/logger.h

@@ -0,0 +1,36 @@
+#ifndef __LOGGER_H_
+#define __LOGGER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <string.h>
+
+void log_init_();
+//void log_deinit_(void);
+void log_print_(const char *str);
+void log_printf_(const char *format, ...);
+void OSFatal_printf(const char *format, ...);
+
+#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
+#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
+
+#define OSFATAL_FUNCTION_LINE(FMT, ARGS...)do { \
+    OSFatal_printf("[%s]%s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
+    } while (0)
+
+#define log_init() log_init_()
+//#define log_deinit() log_deinit_()
+#define log_print(str) log_print_(str)
+#define log_printf(FMT, ARGS...)  log_printf_(FMT, ## ARGS);
+
+#define DEBUG_FUNCTION_LINE(FMT, ARGS...)do { \
+    log_printf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
+    } while (0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif