update hiload

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "3rd/SDL"]
 	path = 3rd/SDL
 	url = https://github.com/libsdl-org/SDL.git
+[submodule "hiload"]
+	path = hiload
+	url = git@git.kitemoonsche.me:schme/hiload.git

CMakeLists.txt

@@ -1,17 +1,14 @@
 cmake_minimum_required(VERSION 3.21)
 project(Hiisi)
 
-# I just like to have this with my tooling
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_STANDARD 17)
 
 add_subdirectory(3rd/SDL EXCLUDE_FROM_ALL)
-add_subdirectory(heload)
+add_subdirectory(hiload)
 add_subdirectory(hiisi)
 
-target_link_options(SDL3-shared PRIVATE -Wl,-z,nodelete)
-
 add_executable(hiisi-run
   hiisi/main.cpp)
 
-target_link_libraries(hiisi-run heload)
+target_link_libraries(hiisi-run hiisi-engine hiload)

heload/CMakeLists.txt

@@ -1,34 +0,0 @@
-cmake_minimum_required(VERSION 3.21)
-project(Heload)
-
-# I just like to have this with my tooling
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_C_STANDARD 99)
-
-add_library(heload SHARED
-  src/heload.c
-)
-
-# Specify the public headers location
-target_include_directories(heload PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> # During build
-    $<INSTALL_INTERFACE:include>  # When installed
-)
-
-install(TARGETS heload
-  EXPORT heloadTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
-)
-
-# Install header files
-install(DIRECTORY include/ DESTINATION include)
-
-# Export the library for find_package()
-install(EXPORT heloadTargets
-    FILE heloadConfig.cmake
-    DESTINATION lib/cmake/heload
-)
-
-export(TARGETS heload FILE heloadConfig.cmake)

heload/include/heload/heload.h

@@ -1,7 +0,0 @@
-#ifndef HELOAD_H_
-#define HELOAD_H_
-
-void print_module_info(const char *module_name);
-
-
-#endif // HELOAD_H_

heload/src/heload.c

@@ -1,15 +0,0 @@
-#include "heload/heload.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <link.h>
-
-
-void print_module_info(const char *module_name) {
-  void *module = dlopen(module_name, RTLD_NOW);
-
-  struct Lmid_t *lmid;
-  dlinfo(module, RTLD_DI_LMID, lmid);
-
-}

hiisi/CMakeLists.txt

@@ -5,6 +5,8 @@ add_library(hiisi-engine SHARED
   hiisi.h
   hiisi.cpp)
 
+target_compile_options(hiisi-engine PRIVATE "-Wall" "-Wextra" "-Wpedantic")
+
 set_property(TARGET hiisi-engine PROPERTY POSITION_INDEPENDENT_CODE ON)
 set_property(TARGET hiisi-engine PROPERTY LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 

hiisi/hiisi.cpp

@@ -7,8 +7,10 @@
 #define WINDOW_HEIGHT 720
 
 /* This function runs once at startup. */
-int init(EngineData *state, int argc, char *argv[])
+int HiisiEngine::init(int argc, char *argv[]) {
-{
+    (void)argc;
+    (void)argv;
+
     SDL_SetAppMetadata("Hiisi Engine", "0.0.1", "me.kitemoonsche.hiisi-engine");
 
     SDL_Window *window = 0;
@@ -19,20 +21,20 @@ int init(EngineData *state, int argc, char *argv[])
         return SDL_APP_FAILURE;
     }
 
-    if (!SDL_CreateWindowAndRenderer("Hiisi Engine", WINDOW_WIDTH, WINDOW_HEIGHT, 0, &window, &renderer)) {
+    if (!SDL_CreateWindowAndRenderer("Hiisi Engine", WINDOW_WIDTH,
+                                     WINDOW_HEIGHT, 0, &window, &renderer)) {
         SDL_Log("Couldn't create window/renderer: %s", SDL_GetError());
         return SDL_APP_FAILURE;
     }
 
-    state->window = window;
+    _window = window;
-    state->renderer = renderer;
+    _renderer = renderer;
 
     return SDL_APP_CONTINUE; /* carry on with the program! */
 }
 
 /* This function runs when a new event (mouse input, keypresses, etc) occurs. */
-int event(EngineData* state)
+int HiisiEngine::event() {
-{
     SDL_Event event;
     while (SDL_PollEvent(&event)) {
         if (event.type == SDL_EVENT_QUIT) {
@@ -43,19 +45,21 @@ int event(EngineData* state)
 }
 
 /* This function runs once per frame, and is the heart of the program. */
-int iterate(EngineData *state)
+int HiisiEngine::iterate() {
-{
+    SDL_Renderer *renderer = (SDL_Renderer *)_renderer;
-    SDL_Renderer *renderer = (SDL_Renderer*)state->renderer;
     SDL_FRect rects[16];
     const Uint64 now = SDL_GetTicks();
-    int i;
+    size_t i;
 
     /* we'll have the rectangles grow and shrink over a few seconds. */
     const float direction = ((now % 2000) >= 1000) ? 1.0f : -1.0f;
-    const float scale = ((float) (((int) (now % 1000)) - 500) / 500.0f) * direction;
+    const float scale =
+        ((float)(((int)(now % 1000)) - 500) / 500.0f) * direction;
 
-    /* as you can see from this, rendering draws over whatever was drawn before it. */
+    /* as you can see from this, rendering draws over whatever was drawn before
-    SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);  /* black, full alpha */
+     * it. */
+    SDL_SetRenderDrawColor(renderer, 0, 0, 0,
+                           SDL_ALPHA_OPAQUE); /* black, full alpha */
     SDL_RenderClear(renderer);                /* start with a blank canvas. */
 
     /* Rectangles are comprised of set of X and Y coordinates, plus width and
@@ -66,38 +70,42 @@ int iterate(EngineData *state)
     /* Let's draw a single rectangle (square, really). */
     rects[0].x = rects[0].y = 100;
     rects[0].w = rects[0].h = 100 + (100 * scale);
-    SDL_SetRenderDrawColor(renderer, 250, 0, 255, SDL_ALPHA_OPAQUE);  /* red, full alpha */
+    SDL_SetRenderDrawColor(renderer, 250, 0, 255,
+                           SDL_ALPHA_OPAQUE); /* red, full alpha */
     SDL_RenderRect(renderer, &rects[0]);
 
     /* Now let's draw several rectangles with one function call. */
     for (i = 0; i < 3; i++) {
-        const float size = (i+1) * 500.0f;
+        const float size = (i + 1) * 500.0f;
         rects[i].w = rects[i].h = size + (size * scale);
         rects[i].x = (WINDOW_WIDTH - rects[i].w) / 2;  /* center it. */
         rects[i].y = (WINDOW_HEIGHT - rects[i].h) / 2; /* center it. */
     }
-    SDL_SetRenderDrawColor(renderer, 255, 255, 0, SDL_ALPHA_OPAQUE);  /* green, full alpha */
+    SDL_SetRenderDrawColor(renderer, 255, 255, 0,
+                           SDL_ALPHA_OPAQUE); /* green, full alpha */
     SDL_RenderRects(renderer, rects, 3); /* draw three rectangles at once */
 
-    /* those were rectangle _outlines_, really. You can also draw _filled_ rectangles! */
+    /* those were rectangle _outlines_, really. You can also draw _filled_
+     * rectangles! */
     rects[0].x = 400;
     rects[0].y = 50;
     rects[0].w = 100 + (100 * scale);
     rects[0].h = 50 + (50 * scale);
-    SDL_SetRenderDrawColor(renderer, 50, 25, 255, SDL_ALPHA_OPAQUE);  /* blue, full alpha */
+    SDL_SetRenderDrawColor(renderer, 50, 25, 255,
+                           SDL_ALPHA_OPAQUE); /* blue, full alpha */
     SDL_RenderFillRect(renderer, &rects[0]);
 
-
     /* ...and also fill a bunch of rectangles at once... */
     for (i = 0; i < SDL_arraysize(rects); i++) {
-        const float w = (float) (WINDOW_WIDTH / SDL_arraysize(rects));
+        const float w = (float)(WINDOW_WIDTH / SDL_arraysize(rects));
         const float h = i * 8.0f;
         rects[i].x = i * w;
         rects[i].y = WINDOW_HEIGHT - h;
         rects[i].w = w;
         rects[i].h = h;
     }
-    SDL_SetRenderDrawColor(renderer, 25, 255, 255, SDL_ALPHA_OPAQUE);  /* white, full alpha */
+    SDL_SetRenderDrawColor(renderer, 25, 255, 255,
+                           SDL_ALPHA_OPAQUE); /* white, full alpha */
     SDL_RenderFillRects(renderer, rects, SDL_arraysize(rects));
 
     SDL_RenderPresent(renderer); /* put it all on the screen! */
@@ -106,7 +114,5 @@ int iterate(EngineData *state)
 }
 
 /* This function runs once at shutdown. */
-void quit(EngineData *state)
+void HiisiEngine::quit() { /* SDL will clean up the window/renderer for us. */
-{
-    /* SDL will clean up the window/renderer for us. */
 }

hiisi/hiisi.h

@@ -1,25 +1,17 @@
 #ifndef HIISI_H_
 #define HIISI_H_
 
-extern "C" {
+class HiisiEngine {
+  public:
+    int init(int argc, char *argv[]);
+    int event();
+    int iterate();
+    void quit();
 
-    struct EngineData {
+  private:
-        void *window = 0;
+    void *_window = 0;
-        void *renderer = 0;
+    void *_renderer = 0;
-    };
+    void *_module = 0;
+};
 
-    struct Engine {
-        void *module = 0;
-        int (*init)(EngineData *, int, char**);
-        int (*event)(EngineData *);
-        int (*iterate)(EngineData *);
-        void (*quit)(EngineData *);
-    };
-
-    int init(EngineData *state, int argc, char *argv[]);
-    int event(EngineData *state);
-    int iterate(EngineData *state);
-    void quit(EngineData *state);
-
-}
 #endif // HIISI_H_

hiisi/main.cpp

@@ -1,115 +1,37 @@
 #include "hiisi.h"
-#include "heload/heload.h"
+
+#include "hiload.h"
 
 #include <assert.h>
-#include <stdio.h>
+#include <atomic>
-#include <stdlib.h>
 #include <dlfcn.h>
 #include <link.h>
 #include <signal.h>
-#include <atomic>
+#include <stdio.h>
-
+#include <stdlib.h>
-std::atomic<bool> reload_requested(false);
-
-void reload_signal_handler(int) {
-    reload_requested = true;
-}
-
-Engine load_hiisi() {
-    const char *name = "build/hiisi/libhiisi-engine.so";
-    void *mod = dlopen(name, RTLD_NOW);
-
-    Lmid_t list;
-    dlinfo(mod, RTLD_DI_LMID, &list);
-    printf("link-map list id: %ld\n", list);
-
-    link_map *lmap = 0;
-    dlinfo(mod, RTLD_DI_LINKMAP, &lmap);
-
-    printf("Link map:\n");
-    printf("addr: %lu\n", lmap->l_addr);
-    printf("name: %s\n", lmap->l_name);
-    printf("dynamic section: %p\n", lmap->l_ld);
-
-    char pathname[256];
-    dlinfo(mod, RTLD_DI_ORIGIN, pathname);
-    printf("path: %s\n", pathname);
-
-    /* Discover the size of the buffer that we must pass to
-       RTLD_DI_SERINFO. */
-    Dl_serinfo serinfo;
-    Dl_serinfo *sip;
-
-    if (dlinfo(mod, RTLD_DI_SERINFOSIZE, &serinfo) == -1) {
-        fprintf(stderr, "RTLD_DI_SERINFOSIZE failed: %s\n", dlerror());
-        exit(EXIT_FAILURE);
-    }
-
-    /* Allocate the buffer for use with RTLD_DI_SERINFO. */
-
-    sip = (Dl_serinfo*)malloc(serinfo.dls_size);
-    if (sip == NULL) {
-        perror("malloc");
-        exit(EXIT_FAILURE);
-    }
-
-    /* Initialize the 'dls_size' and 'dls_cnt' fields in the newly
-       allocated buffer. */
-
-    if (dlinfo(mod, RTLD_DI_SERINFOSIZE, sip) == -1) {
-        fprintf(stderr, "RTLD_DI_SERINFOSIZE failed: %s\n", dlerror());
-        exit(EXIT_FAILURE);
-    }
-
-    /* Fetch and print library search list. */
-
-    if (dlinfo(mod, RTLD_DI_SERINFO, sip) == -1) {
-        fprintf(stderr, "RTLD_DI_SERINFO failed: %s\n", dlerror());
-        exit(EXIT_FAILURE);
-    }
-
-    for (size_t j = 0; j < serinfo.dls_cnt; j++)
-        printf("dls_serpath[%zu].dls_name = %s\n",
-               j, sip->dls_serpath[j].dls_name);
-
-    Engine engine;
-    engine.module = mod;
-    *(void **)&engine.init = dlsym(mod, "init");
-    *(void **)&engine.event = dlsym(mod, "event");
-    *(void **)&engine.iterate = dlsym(mod, "iterate");
-    *(void **)&engine.quit = dlsym(mod, "quit");
-
-    assert(engine.init);
-    assert(engine.event);
-    assert(engine.iterate);
-    assert(engine.quit);
-
-    return engine;
-}
 
 int main(int argc, char **argv) {
 
-    signal(SIGUSR1, reload_signal_handler);
+    /* Hiload hotreloader is compiled as a shared library, these are the
+     * only required changes for the code to successfully reload  */
 
-    EngineData state;
+    // Init hiload
+    const char *himodules[] = {"", "libhiisi-engine.so"};
+    hi_init(2, himodules);
 
-    Engine hiisi = load_hiisi();
+    HiisiEngine hiisi;
-    if (!hiisi.module) {
+
-        printf("%s\n", dlerror());
+    hiisi.init(argc, argv);
-        return 1;
+    while (hiisi.event()) {
+        hiisi.iterate();
+
+        // Reload changes
+        hi_reload();
     }
 
-    hiisi.init(&state, argc, argv);
+    hiisi.quit();
-    while (hiisi.event(&state)) {
-        hiisi.iterate(&state);
-        if (reload_requested) {
-            dlclose(hiisi.module);
-            hiisi = load_hiisi();
-            reload_requested = false;
-        }
-    }
-
-    dlclose(hiisi.module);
 
+    // Deinit hiload
+    hi_deinit();
     return 0;
 }

live-reloader.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Watching changes in hiisi..."
-inotifywait --monitor -e modify build/hiisi/ |
-    while read -r _ action file; do
-        sleep 0.1
-        echo "$(date +%H:%M:%S): Hiisi changed!"
-        echo "$action on $file"
-        HIISI_PID=$(pgrep -x hiisi-run)
-        kill -USR1 "${HIISI_PID}" && echo "Signal sent!" || echo "Signal send failed!"
-    done