Rename allocation_tracker module.

io7m-com · Dec 12, 2024 · 73ac382 · 73ac382
1 parent 19795a5
commit 73ac382
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 21 deletions.
diff --git a/README.in b/README.in
@@ -65,6 +65,16 @@ If this step fails, it's a bug. Please report it!
 
 ## Utilities
 
+### com.io7m.jcoronado.utility.allocation_tracker
+
+The `com.io7m.jcoronado.utility.allocation_tracker` module provides a simple
+implementation of the `VulkanHostAllocatorType` interface that simply delegates
+an existing allocator (such as `jemalloc`) but also tracks the current amount
+of memory allocated for every allocation type.
+
+Simply instantiate a `VulkanHostAllocatorTracker` instance and use it anywhere
+the API accepts a `VulkanHostAllocatorType`.
+
 ### com.io7m.jcoronado.utility.swapchain
 
 The `com.io7m.jcoronado.utility.swapchain` module provides a utility for

diff --git a/com.io7m.jcoronado.documentation/pom.xml b/com.io7m.jcoronado.documentation/pom.xml
@@ -26,7 +26,12 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>com.io7m.jcoronado.allocation_tracker</artifactId>
+      <artifactId>com.io7m.jcoronado.utility.allocation_tracker</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>com.io7m.jcoronado.utility.swapchain</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/com.io7m.jcoronado.documentation/src/main/java/module-info.java b/com.io7m.jcoronado.documentation/src/main/java/module-info.java
@@ -28,6 +28,7 @@
   requires com.io7m.jcoronado.vma;
   requires com.io7m.jcoronado.api;
   requires com.io7m.jcoronado.extensions.khr.surface.api;
-  requires com.io7m.jcoronado.allocation.tracker;
+  requires com.io7m.jcoronado.utility.allocation_tracker;
+  requires com.io7m.jcoronado.utility.swapchain;
   requires com.io7m.jcoronado.lwjgl;
 }
diff --git a/com.io7m.jcoronado.examples/pom.xml b/com.io7m.jcoronado.examples/pom.xml
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>com.io7m.jcoronado.allocation_tracker</artifactId>
+      <artifactId>com.io7m.jcoronado.utility.allocation_tracker</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

diff --git a/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/BufferCopy.java b/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/BufferCopy.java
@@ -16,7 +16,7 @@
 
 package com.io7m.jcoronado.examples;
 
-import com.io7m.jcoronado.allocation_tracker.VulkanHostAllocatorTracker;
+import com.io7m.jcoronado.utility.allocation_tracker.VulkanHostAllocatorTracker;
 import com.io7m.jcoronado.api.VulkanApplicationInfo;
 import com.io7m.jcoronado.api.VulkanBufferCopy;
 import com.io7m.jcoronado.api.VulkanBufferCreateInfo;

diff --git a/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/Framebuffer.java b/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/Framebuffer.java
@@ -16,7 +16,7 @@
 
 package com.io7m.jcoronado.examples;
 
-import com.io7m.jcoronado.allocation_tracker.VulkanHostAllocatorTracker;
+import com.io7m.jcoronado.utility.allocation_tracker.VulkanHostAllocatorTracker;
 import com.io7m.jcoronado.api.VulkanApplicationInfo;
 import com.io7m.jcoronado.api.VulkanAttachmentDescription;
 import com.io7m.jcoronado.api.VulkanAttachmentReference;

diff --git a/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/HelloSwapChain.java b/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/HelloSwapChain.java
@@ -16,7 +16,7 @@
 
 package com.io7m.jcoronado.examples;
 
-import com.io7m.jcoronado.allocation_tracker.VulkanHostAllocatorTracker;
+import com.io7m.jcoronado.utility.allocation_tracker.VulkanHostAllocatorTracker;
 import com.io7m.jcoronado.api.VulkanApplicationInfo;
 import com.io7m.jcoronado.api.VulkanClearValueColorFloatingPoint;
 import com.io7m.jcoronado.api.VulkanCommandBufferSubmitInfo;
@@ -29,7 +29,6 @@
 import com.io7m.jcoronado.api.VulkanImageAspectFlag;
 import com.io7m.jcoronado.api.VulkanImageMemoryBarrier;
 import com.io7m.jcoronado.api.VulkanImageSubresourceRange;
-import com.io7m.jcoronado.api.VulkanImageUsageFlag;
 import com.io7m.jcoronado.api.VulkanInstanceCreateInfo;
 import com.io7m.jcoronado.api.VulkanLayerProperties;
 import com.io7m.jcoronado.api.VulkanLayers;
@@ -53,7 +52,6 @@
 import com.io7m.jcoronado.extensions.ext_debug_utils.api.VulkanDebugUtilsType;
 import com.io7m.jcoronado.extensions.ext_layer_settings.api.VulkanLayerSettingsCreateInfo;
 import com.io7m.jcoronado.extensions.khr_surface.api.VulkanExtKHRSurfaceType;
-import com.io7m.jcoronado.extensions.khr_swapchain.api.VulkanCompositeAlphaFlagKHR;
 import com.io7m.jcoronado.extensions.khr_swapchain.api.VulkanExtKHRSwapChainType;
 import com.io7m.jcoronado.layers.khronos_validation.api.VulkanValidationValidateSync;
 import com.io7m.jcoronado.lwjgl.VulkanLWJGLHostAllocatorJeMalloc;

diff --git a/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/HelloVulkan.java b/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/HelloVulkan.java
@@ -16,7 +16,7 @@
 
 package com.io7m.jcoronado.examples;
 
-import com.io7m.jcoronado.allocation_tracker.VulkanHostAllocatorTracker;
+import com.io7m.jcoronado.utility.allocation_tracker.VulkanHostAllocatorTracker;
 import com.io7m.jcoronado.api.VulkanApplicationInfo;
 import com.io7m.jcoronado.api.VulkanAttachmentDescription;
 import com.io7m.jcoronado.api.VulkanAttachmentReference;

diff --git a/...io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/HelloVulkanWithVMA.java b/...io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/HelloVulkanWithVMA.java
@@ -16,7 +16,7 @@
 
 package com.io7m.jcoronado.examples;
 
-import com.io7m.jcoronado.allocation_tracker.VulkanHostAllocatorTracker;
+import com.io7m.jcoronado.utility.allocation_tracker.VulkanHostAllocatorTracker;
 import com.io7m.jcoronado.api.VulkanApplicationInfo;
 import com.io7m.jcoronado.api.VulkanAttachmentDescription;
 import com.io7m.jcoronado.api.VulkanAttachmentReference;
@@ -94,7 +94,6 @@
 import com.io7m.jcoronado.api.VulkanSemaphoreBinaryCreateInfo;
 import com.io7m.jcoronado.api.VulkanSemaphoreBinaryType;
 import com.io7m.jcoronado.api.VulkanSemaphoreSubmitInfo;
-import com.io7m.jcoronado.api.VulkanSemaphoreType;
 import com.io7m.jcoronado.api.VulkanShaderModuleCreateInfo;
 import com.io7m.jcoronado.api.VulkanShaderModuleType;
 import com.io7m.jcoronado.api.VulkanSharingMode;

diff --git a/...io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/MemoryRequirements.java b/...io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/MemoryRequirements.java
@@ -16,7 +16,7 @@
 
 package com.io7m.jcoronado.examples;
 
-import com.io7m.jcoronado.allocation_tracker.VulkanHostAllocatorTracker;
+import com.io7m.jcoronado.utility.allocation_tracker.VulkanHostAllocatorTracker;
 import com.io7m.jcoronado.api.VulkanApplicationInfo;
 import com.io7m.jcoronado.api.VulkanBufferCreateInfo;
 import com.io7m.jcoronado.api.VulkanException;

diff --git a/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/Versioning.java b/com.io7m.jcoronado.examples/src/main/java/com/io7m/jcoronado/examples/Versioning.java
@@ -16,7 +16,7 @@
 
 package com.io7m.jcoronado.examples;
 
-import com.io7m.jcoronado.allocation_tracker.VulkanHostAllocatorTracker;
+import com.io7m.jcoronado.utility.allocation_tracker.VulkanHostAllocatorTracker;
 import com.io7m.jcoronado.api.VulkanApplicationInfo;
 import com.io7m.jcoronado.api.VulkanException;
 import com.io7m.jcoronado.api.VulkanInstanceCreateInfo;

diff --git a/com.io7m.jcoronado.examples/src/main/resources/logback.xml b/com.io7m.jcoronado.examples/src/main/resources/logback.xml
@@ -15,7 +15,7 @@
   </root>
 
   <logger
-    name="com.io7m.jcoronado.allocation_tracker.VulkanHostAllocatorTracker"
+    name="com.io7m.jcoronado.utility.allocation_tracker.VulkanHostAllocatorTracker"
     level="INFO"/>
 
 </configuration>
diff --git a/...io7m.jcoronado.allocation_tracker/pom.xml → ...ronado.utility.allocation_tracker/pom.xml b/...io7m.jcoronado.allocation_tracker/pom.xml → ...ronado.utility.allocation_tracker/pom.xml
@@ -12,10 +12,10 @@
     <version>0.0.2-SNAPSHOT</version>
   </parent>
 
-  <artifactId>com.io7m.jcoronado.allocation_tracker</artifactId>
+  <artifactId>com.io7m.jcoronado.utility.allocation_tracker</artifactId>
 
   <packaging>jar</packaging>
-  <name>com.io7m.jcoronado.allocation_tracker</name>
+  <name>com.io7m.jcoronado.utility.allocation_tracker</name>
   <description>Type-safe Vulkan frontend (Allocation tracker)</description>
   <url>https://www.io7m.com/software/jcoronado</url>
 

diff --git a/...n_tracker/VulkanHostAllocatorTracker.java → ...n_tracker/VulkanHostAllocatorTracker.java b/...n_tracker/VulkanHostAllocatorTracker.java → ...n_tracker/VulkanHostAllocatorTracker.java
@@ -14,7 +14,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-package com.io7m.jcoronado.allocation_tracker;
+package com.io7m.jcoronado.utility.allocation_tracker;
 
 import com.io7m.jcoronado.api.VulkanHostAllocatorCallbacks;
 import com.io7m.jcoronado.api.VulkanHostAllocatorType;

diff --git a/...nado/allocation_tracker/package-info.java → ...lity/allocation_tracker/package-info.java b/...nado/allocation_tracker/package-info.java → ...lity/allocation_tracker/package-info.java
@@ -20,7 +20,7 @@
 
 @Export
 @Version("1.0.0")
-package com.io7m.jcoronado.allocation_tracker;
+package com.io7m.jcoronado.utility.allocation_tracker;
 
 import org.osgi.annotation.bundle.Export;
 import org.osgi.annotation.versioning.Version;
diff --git a/...on_tracker/src/main/java/module-info.java → ...on_tracker/src/main/java/module-info.java b/...on_tracker/src/main/java/module-info.java → ...on_tracker/src/main/java/module-info.java
@@ -18,7 +18,7 @@
  * Type-safe Vulkan frontend (Allocation tracker)
  */
 
-module com.io7m.jcoronado.allocation.tracker
+module com.io7m.jcoronado.utility.allocation_tracker
 {
   requires static org.osgi.annotation.bundle;
   requires static org.osgi.annotation.versioning;
@@ -27,5 +27,5 @@
   requires org.slf4j;
   requires it.unimi.dsi.fastutil;
 
-  exports com.io7m.jcoronado.allocation_tracker;
+  exports com.io7m.jcoronado.utility.allocation_tracker;
 }
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,6 @@
   <url>https://www.io7m.com/software/jcoronado</url>
 
   <modules>
-    <module>com.io7m.jcoronado.allocation_tracker</module>
     <module>com.io7m.jcoronado.api</module>
     <module>com.io7m.jcoronado.documentation</module>
     <module>com.io7m.jcoronado.examples</module>
@@ -34,6 +33,7 @@
     <module>com.io7m.jcoronado.layers.lunarg_api_dump.api</module>
     <module>com.io7m.jcoronado.lwjgl</module>
     <module>com.io7m.jcoronado.tests</module>
+    <module>com.io7m.jcoronado.utility.allocation_tracker</module>
     <module>com.io7m.jcoronado.utility.swapchain</module>
     <module>com.io7m.jcoronado.vma</module>
   </modules>