Experimentally enable libgc everywhere to see if things build.

Author: davidgiven

.github/workflows/ccpp.yml

@@ -46,7 +46,7 @@ jobs:
         path: 'fluxengine-testdata'
     - name: brew
       run: |
-        brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg libmagic nlohmann-json cli11 boost glfw3 md4c ninja python freetype2 mbedtls@3 lunasvg
+        brew install sqlite pkg-config libusb protobuf wxwidgets fmt make coreutils dylibbundler libjpeg libmagic nlohmann-json cli11 boost glfw3 md4c ninja python freetype2 mbedtls@3 lunasvg libgc
         brew link mbedtls@3
         brew upgrade
     - name: make
@@ -77,6 +77,7 @@ jobs:
         pacboy: |
           protobuf:p pkgconf:p curl-winssl:p file:p glfw:p mbedtls:p
           sqlite:p freetype:p boost:p gcc:p binutils:p nsis:p abseil-cpp:p
+          gc:p
 
     - name: debug
       run: |

build.py

@@ -16,6 +16,7 @@
 package(name="protobuf_lib", package="protobuf")
 package(name="z_lib", package="zlib")
 package(name="sqlite3_lib", package="sqlite3")
+package(name="gc_lib", package="bdw-gc", ldflags=["-lgccpp"])
 
 clibrary(name="protocol", hdrs={"protocol.h": "./protocol.h"})
 

build/pkg.py

@@ -34,16 +34,16 @@ def get_property(self, name, flag):
 HostPkgConfig = _PkgConfig(G.HOST_PKG_CONFIG)
 
 
-def _package(self, name, package, fallback, pkgconfig):
+def _package(
+    self, name, package, fallback, extra_ldflags, extra_cflags, pkgconfig
+):
     if pkgconfig.has_package(package):
         print(f"package '{package}' found")
         cflags = pkgconfig.get_property(package, "--cflags")
         ldflags = pkgconfig.get_property(package, "--libs")
 
-        if cflags:
-            self.args["caller_cflags"] = [cflags]
-        if ldflags:
-            self.args["caller_ldflags"] = [ldflags]
+        self.args["caller_cflags"] = extra_cflags + [cflags]
+        self.args["caller_ldflags"] = extra_ldflags + [ldflags]
         self.args["clibrary_deps"] = [self]
         self.args["cheader_deps"] = [self]
         self.traits.update({"clibrary", "cxxlibrary"})
@@ -70,13 +70,17 @@ def _package(self, name, package, fallback, pkgconfig):
 
 
 @Rule
-def package(self, name, package=None, fallback: Target = None):
-    _package(self, name, package, fallback, TargetPkgConfig)
+def package(
+    self, name, package=None, fallback: Target = None, ldflags=[], cflags=[]
+):
+    _package(self, name, package, fallback, ldflags, cflags, TargetPkgConfig)
 
 
 @Rule
-def hostpackage(self, name, package=None, fallback: Target = None):
-    _package(self, name, package, fallback, HostPkgConfig)
+def hostpackage(
+    self, name, package=None, fallback: Target = None, ldflags=[], cflags=[]
+):
+    _package(self, name, package, fallback, ldflags, cflags, HostPkgConfig)
 
 
 def has_package(name):

lib/core/globals.h

@@ -17,6 +17,7 @@
 #include <optional>
 #include <regex>
 #include <ranges>
+#include <gc_cpp.h>
 #include "fmt/format.h"
 
 #if defined(_WIN32) || defined(__WIN32__)

lib/data/disk.h

@@ -11,7 +11,7 @@ class LogicalTrackLayout;
 class PhysicalTrackLayout;
 class Sector;
 
-struct Record
+struct Record: public gc
 {
     nanoseconds_t clock = 0;
     nanoseconds_t startTime = 0;
@@ -20,7 +20,7 @@ struct Record
     Bytes rawData;
 };
 
-struct Track
+struct Track: public gc
 {
     std::shared_ptr<const LogicalTrackLayout> ltl;
     std::shared_ptr<const PhysicalTrackLayout> ptl;
@@ -36,7 +36,7 @@ struct Track
     std::vector<std::shared_ptr<const Sector>> normalisedSectors;
 };
 
-struct Disk
+struct Disk: public gc
 {
     Disk();
 

lib/data/fluxmap.h

@@ -8,7 +8,7 @@
 
 class RawBits;
 
-class Fluxmap
+class Fluxmap: public gc
 {
 public:
     struct Position

lib/data/fluxpattern.h

@@ -8,15 +8,15 @@
 class FluxMatcher;
 class DecoderProto;
 
-struct FluxMatch
+struct FluxMatch: public gc
 {
     const FluxMatcher* matcher;
     unsigned intervals;
     double clock;
     unsigned zeroes;
 };
 
-class FluxMatcher
+class FluxMatcher: public gc
 {
 public:
     virtual ~FluxMatcher() {}

lib/data/image.h

@@ -17,7 +17,7 @@ struct Geometry
     unsigned totalBytes = 0;
 };
 
-class Image
+class Image: public gc
 {
 public:
     Image();

lib/data/layout.h

@@ -8,7 +8,7 @@
 
 class ConfigProto;
 
-struct LogicalTrackLayout
+struct LogicalTrackLayout: public gc
 {
     /* Physical cylinder of the first element of the group. */
     unsigned physicalCylinder;
@@ -50,7 +50,7 @@ struct LogicalTrackLayout
     std::map<unsigned, unsigned> sectorIdToNaturalOrdering;
 };
 
-struct PhysicalTrackLayout
+struct PhysicalTrackLayout: public gc
 {
     /* Physical location of this track. */
     unsigned physicalCylinder;
@@ -65,7 +65,7 @@ struct PhysicalTrackLayout
     std::shared_ptr<const LogicalTrackLayout> logicalTrackLayout;
 };
 
-class DiskLayout
+class DiskLayout: public gc
 {
 public:
     DiskLayout(const ConfigProto& config = globalConfig());
@@ -176,7 +176,7 @@ static std::shared_ptr<DiskLayout> createDiskLayout(
     return std::make_shared<DiskLayout>(config);
 }
 
-class TrackInfo
+class TrackInfo: public gc
 {
 public:
     TrackInfo() {}

lib/data/sector.h

@@ -8,7 +8,7 @@
 class Record;
 class LogicalTrackLayout;
 
-struct Sector : public LogicalLocation
+struct Sector : public LogicalLocation, public gc
 {
     enum Status
     {