Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

std.experimental.allocator -> stdx.allocator & janitor work #4

Merged
merged 2 commits into from Mar 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
@@ -0,0 +1,9 @@
.dub/
*.a
*.so
*.exe
*.dll
/spew
/*-test-*
dub.selections.json
/include
1 change: 1 addition & 0 deletions dub.json
Expand Up @@ -11,6 +11,7 @@
"mainSourceFile": "src/diagnostic.d",
"targetType": "executable",
"dependencies": {
"stdx-allocator": "~>2.77.0",
"de_bindings:opengl": "*",
"spew:implementation": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/event_loop/base.d
Expand Up @@ -6,7 +6,7 @@ module cf.spew.event_loop.base;
import cf.spew.event_loop.defs;
import cf.spew.events.defs;
import devisualization.util.core.memory.managed;
import std.experimental.allocator;
import stdx.allocator;
import core.thread : ThreadID, Thread;
import core.time : Duration, seconds;

Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/event_loop/defs.d
Expand Up @@ -4,7 +4,7 @@
*/
module cf.spew.event_loop.defs;
import cf.spew.events.defs : EventSource, Event, EventType;
import std.experimental.allocator : ISharedAllocator;
import stdx.allocator : ISharedAllocator;
import core.time : Duration, seconds;
import core.thread : ThreadID, Thread;

Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/event_loop/wells/libuv.d
Expand Up @@ -5,7 +5,7 @@
module cf.spew.event_loop.wells.libuv;
import cf.spew.event_loop.defs;
import cf.spew.events.defs;
import std.experimental.allocator : ISharedAllocator, make;
import stdx.allocator : ISharedAllocator, make;
import devisualization.bindings.libuv;
import core.time;
import core.atomic;
Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/event_loop/wells/winapi.d
Expand Up @@ -10,7 +10,7 @@ import cf.spew.event_loop.known_implementations;
import cf.spew.events.defs;
import cf.spew.events.winapi;
import cf.spew.events.windowing;
import std.experimental.allocator : ISharedAllocator, make;
import stdx.allocator : ISharedAllocator, make;
import core.sys.windows.windows : LRESULT, WPARAM, LPARAM, HWND, WM_USER, MSG;
import core.time : Duration;

Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/event_loop/wells/x11.d
Expand Up @@ -5,7 +5,7 @@
module cf.spew.event_loop.wells.x11;
import cf.spew.event_loop.defs;
import cf.spew.events.defs;
import std.experimental.allocator : ISharedAllocator, make;
import stdx.allocator : ISharedAllocator, make;
import devisualization.bindings.x11;

Display* x11Display() {
Expand Down
6 changes: 3 additions & 3 deletions src/base/cf/spew/instance.d
Expand Up @@ -80,7 +80,7 @@ interface Management_EventLoop {
///
interface Management_UserInterface {
import cf.spew.ui : IWindow, IDisplay, IWindowCreator, IRenderPoint, IRenderPointCreator;
import std.experimental.allocator : IAllocator, theAllocator;
import stdx.allocator : IAllocator, theAllocator;

///
managed!IRenderPointCreator createRenderPoint(IAllocator alloc = theAllocator()) shared;
Expand Down Expand Up @@ -110,7 +110,7 @@ interface Management_UserInterface {
interface Management_Streams {
import cf.spew.streams;
import std.socket : Address;
import std.experimental.allocator : IAllocator, theAllocator;
import stdx.allocator : IAllocator, theAllocator;

/// A TCP server
managed!ISocket_TCPServer tcpServer(Address address, ushort listBacklogAmount=64, IAllocator alloc=theAllocator()) shared;
Expand All @@ -128,7 +128,7 @@ interface Management_Streams {

/// Beware, thread-local!
interface Management_Miscellaneous {
import std.experimental.allocator : IAllocator, theAllocator;
import stdx.allocator : IAllocator, theAllocator;
import cf.spew.miscellaneous;
import core.time : Duration;

Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/streams/defs.d
Expand Up @@ -4,7 +4,7 @@
*/
module cf.spew.streams.defs;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : IAllocator, theAllocator;
import stdx.allocator : IAllocator, theAllocator;
import std.socket : Address;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/streams/udp.d
Expand Up @@ -5,7 +5,7 @@
module cf.spew.streams.udp;
import cf.spew.streams.defs;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : IAllocator, theAllocator;
import stdx.allocator : IAllocator, theAllocator;
import std.socket : Address;
import core.time : Duration;

Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/ui/display/defs.d
Expand Up @@ -10,7 +10,7 @@ module cf.spew.ui.display.defs;
interface IDisplay {
import cf.spew.ui.window.defs : IWindow;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : IAllocator;
import stdx.allocator : IAllocator;

private import cf.spew.ui.rendering : vec2;

Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/ui/display/features/screenshot.d
Expand Up @@ -7,7 +7,7 @@
module cf.spew.ui.display.features.screenshot;
import cf.spew.ui.display.defs;
import devisualization.image : ImageStorage;
import std.experimental.allocator : IAllocator, theAllocator;
import stdx.allocator : IAllocator, theAllocator;
import std.experimental.color : RGB8;
import devisualization.util.core.memory.managed;

Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/ui/features/clipboard.d
Expand Up @@ -7,7 +7,7 @@
module cf.spew.ui.features.clipboard;
import cf.spew.instance;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : IAllocator, theAllocator;
import stdx.allocator : IAllocator, theAllocator;

interface Have_Management_Clipboard {
shared(Feature_Management_Clipboard) __getFeatureClipboard() shared;
Expand Down
4 changes: 2 additions & 2 deletions src/base/cf/spew/ui/features/notifications.d
Expand Up @@ -10,7 +10,7 @@ import cf.spew.instance;
import devisualization.image : ImageStorage;
import std.experimental.color : RGBA8;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : ISharedAllocator, processAllocator;
import stdx.allocator : ISharedAllocator, processAllocator;
import std.traits : isSomeString;

interface Have_Notification {
Expand Down Expand Up @@ -86,7 +86,7 @@ void notify(S1, S2)(shared(Management_UserInterface) self, shared(ImageStorage!R
return;
if (shared(Have_Notification) ss = cast(shared(Have_Notification))self) {
import std.utf : byDchar, codeLength;
import std.experimental.allocator : makeArray, dispose;
import stdx.allocator : makeArray, dispose;

auto fss = ss.__getFeatureNotification();

Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/ui/features/screenshot.d
Expand Up @@ -7,7 +7,7 @@
module cf.spew.ui.features.screenshot;
import cf.spew.instance;
import devisualization.image : ImageStorage;
import std.experimental.allocator : IAllocator, theAllocator;
import stdx.allocator : IAllocator, theAllocator;
import std.experimental.color : RGB8;
import devisualization.util.core.memory.managed;

Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/ui/rendering.d
Expand Up @@ -10,7 +10,7 @@ import cf.spew.ui.events;
import cf.spew.ui.display;
import cf.spew.ui.context.defs : IContext;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : IAllocator;
import stdx.allocator : IAllocator;
//import std.experimental.math.linearalgebra.vector : vec2;

struct vec2(T) {
Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/ui/window/defs.d
Expand Up @@ -10,7 +10,7 @@ import std.experimental.color.rgb : RGB8, RGBA8;
import cf.spew.ui.rendering;
import cf.spew.ui.window.events : IWindowEvents;
//import std.experimental.math.linearalgebra.vector : vec2;
import std.experimental.allocator : IAllocator;
import stdx.allocator : IAllocator;
import devisualization.util.core.memory.managed;

///
Expand Down
2 changes: 1 addition & 1 deletion src/base/cf/spew/ui/window/features/screenshot.d
Expand Up @@ -7,7 +7,7 @@
module cf.spew.ui.window.features.screenshot;
import cf.spew.ui.window.defs;
import devisualization.image : ImageStorage;
import std.experimental.allocator : IAllocator, theAllocator;
import stdx.allocator : IAllocator, theAllocator;
import std.experimental.color : RGB8;
import devisualization.util.core.memory.managed;

Expand Down
2 changes: 1 addition & 1 deletion src/diagnostic.d
Expand Up @@ -2,7 +2,7 @@ module diagnostic;

import core.time : Duration, dur;
import std.datetime : msecs;
import std.experimental.allocator;
import stdx.allocator;

import devisualization.util.core.memory.managed;
import devisualization.bindings.opengl;
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/cf/spew/implementation/consumers.d
Expand Up @@ -11,7 +11,7 @@ public import devisualization.image : ImageStorage;
public import std.experimental.color : RGB8, RGBA8;
public import std.experimental.containers.list;
public import std.experimental.containers.map;
public import std.experimental.allocator : IAllocator, processAllocator, theAllocator, dispose, make, makeArray, expandArray, shrinkArray;
public import stdx.allocator : IAllocator, processAllocator, theAllocator, dispose, make, makeArray, expandArray, shrinkArray;
public import devisualization.util.core.memory.managed;

abstract class EventLoopConsumerImpl : EventLoopConsumer {
Expand Down
6 changes: 3 additions & 3 deletions src/implementation/cf/spew/implementation/instance.d
Expand Up @@ -5,7 +5,7 @@
module cf.spew.implementation.instance;
import cf.spew.instance;
import cf.spew.ui.features;
import std.experimental.allocator : IAllocator, ISharedAllocator, make, dispose, processAllocator, theAllocator, makeArray;
import stdx.allocator : IAllocator, ISharedAllocator, make, dispose, processAllocator, theAllocator, makeArray;
import devisualization.image : ImageStorage;
import std.experimental.color : RGBA8;
import devisualization.util.core.memory.managed;
Expand Down Expand Up @@ -141,7 +141,7 @@ final class EventLoopWrapper : Management_EventLoop {

abstract class UIInstance : Management_UserInterface, Have_Notification, Have_Management_Clipboard {
import cf.spew.ui : IWindow, IDisplay, IWindowCreator, IRenderPoint, IRenderPointCreator;
import std.experimental.allocator : IAllocator, processAllocator;
import stdx.allocator : IAllocator, processAllocator;
import devisualization.util.core.memory.managed;
import std.experimental.containers.map;

Expand Down Expand Up @@ -561,7 +561,7 @@ final class UIInstance_X11 : UIInstance, Feature_Notification, Feature_Managemen
abstract class StreamsInstance : Management_Streams {
import cf.spew.streams;
import std.socket : Address;
import std.experimental.allocator : ISharedAllocator, processAllocator;
import stdx.allocator : ISharedAllocator, processAllocator;

shared(ISharedAllocator) allocator;

Expand Down
2 changes: 1 addition & 1 deletion src/implementation/cf/spew/implementation/manager.d
Expand Up @@ -7,7 +7,7 @@ import cf.spew.event_loop.defs;
import cf.spew.event_loop.base;
import cf.spew.events.defs;
import devisualization.util.core.memory.managed;
import std.experimental.allocator;
import stdx.allocator;
import core.thread : ThreadID, Thread;
import core.time : Duration, seconds;

Expand Down
@@ -1,7 +1,7 @@
module cf.spew.implementation.misc.filewatcher;
import cf.spew.miscellaneous.filewatcher;
import devisualization.bindings.libuv;
import std.experimental.allocator : IAllocator, makeArray, dispose;
import stdx.allocator : IAllocator, makeArray, dispose;

abstract class FileSystemWatcherImpl : IFileSystemWatcher {
package(cf.spew.implementation) {
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/cf/spew/implementation/streams/tcp.d
Expand Up @@ -8,7 +8,7 @@ import cf.spew.streams.defs;
import cf.spew.streams.tcp;
import devisualization.util.core.memory.managed;
import devisualization.bindings.libuv;
import std.experimental.allocator : IAllocator, theAllocator, make, dispose, makeArray;
import stdx.allocator : IAllocator, theAllocator, make, dispose, makeArray;
import std.socket : Address, AddressFamily, sockaddr, InternetAddress, Internet6Address;
import core.time : Duration;

Expand Down
Expand Up @@ -9,7 +9,7 @@ import cf.spew.streams.defs;
import cf.spew.streams.tcp;
import devisualization.bindings.libuv;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : IAllocator, theAllocator, make, dispose;
import stdx.allocator : IAllocator, theAllocator, make, dispose;
import std.socket : Address, AddressFamily, sockaddr, InternetAddress, Internet6Address;
import core.time : Duration;

Expand Down
2 changes: 1 addition & 1 deletion src/implementation/cf/spew/implementation/streams/udp.d
Expand Up @@ -8,7 +8,7 @@ import cf.spew.streams.defs;
import cf.spew.streams.udp;
import devisualization.util.core.memory.managed;
import devisualization.bindings.libuv;
import std.experimental.allocator : IAllocator, theAllocator, make, dispose, makeArray;
import stdx.allocator : IAllocator, theAllocator, make, dispose, makeArray;
import std.socket : Address, InternetAddress, Internet6Address, AddressFamily;
import core.time : Duration;

Expand Down
Expand Up @@ -7,7 +7,7 @@ import cf.spew.ui.context.defs;
import cf.spew.ui.context.features.vram;
import devisualization.image : ImageStorage;
import std.experimental.color : RGB8, RGBA8;
import std.experimental.allocator : IAllocator, make, dispose;
import stdx.allocator : IAllocator, make, dispose;

class VRAMContextImpl : IContext, Have_VRam, Feature_VRam {
Feature_VRam __getFeatureVRam() {
Expand Down
Expand Up @@ -10,7 +10,7 @@ import cf.spew.ui.rendering : vec2;
import devisualization.image : ImageStorage;
import std.experimental.color : RGB8;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : IAllocator, make, makeArray;
import stdx.allocator : IAllocator, make, makeArray;

abstract class DisplayImpl : IDisplay {
package(cf.spew) {
Expand Down
2 changes: 1 addition & 1 deletion src/implementation/cf/spew/implementation/windowing/menu.d
Expand Up @@ -8,7 +8,7 @@ import cf.spew.implementation.instance;
import cf.spew.ui.window.features.menu;
import cf.spew.ui.rendering : vec2;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : IAllocator, make, makeArray, expandArray, dispose;
import stdx.allocator : IAllocator, make, makeArray, expandArray, dispose;
import devisualization.image : ImageStorage;
import std.experimental.color : RGB8, RGBA8;

Expand Down
2 changes: 1 addition & 1 deletion src/implementation/cf/spew/implementation/windowing/misc.d
Expand Up @@ -11,7 +11,7 @@ import devisualization.image : ImageStorage;
import std.experimental.color : RGB8, RGBA8;
import std.experimental.containers.list;
import std.experimental.containers.map;
import std.experimental.allocator : IAllocator, ISharedAllocator, processAllocator, theAllocator, dispose, make, makeArray, expandArray, shrinkArray;
import stdx.allocator : IAllocator, ISharedAllocator, processAllocator, theAllocator, dispose, make, makeArray, expandArray, shrinkArray;
import devisualization.util.core.memory.managed;
import derelict.util.sharedlib;

Expand Down
Expand Up @@ -9,7 +9,7 @@ import cf.spew.implementation.windowing.display;
import cf.spew.implementation.windowing.menu;
import cf.spew.ui;
import cf.spew.events.windowing;
import std.experimental.allocator : IAllocator, make, makeArray, dispose;
import stdx.allocator : IAllocator, make, makeArray, dispose;
import devisualization.util.core.memory.managed;
import devisualization.image : ImageStorage;
import std.experimental.color : RGBA8, RGB8;
Expand Down
Expand Up @@ -10,7 +10,7 @@ import cf.spew.ui.context.features.custom;
import devisualization.image : ImageStorage;
import std.experimental.color : RGBA8;
import devisualization.util.core.memory.managed;
import std.experimental.allocator : IAllocator, make;
import stdx.allocator : IAllocator, make;

abstract class WindowCreatorImpl : IWindowCreator, Have_CustomCtx {
package(cf.spew) {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/std/experimental/containers/list.d
@@ -1,5 +1,5 @@
module std.experimental.containers.list;
import std.experimental.allocator : IAllocator, ISharedAllocator, theAllocator, processAllocator, make, dispose, makeArray, shrinkArray, expandArray;
import stdx.allocator : IAllocator, ISharedAllocator, theAllocator, processAllocator, make, dispose, makeArray, shrinkArray, expandArray;
import devisualization.util.core.memory.managed;
import std.traits : isArray, isPointer;
import core.atomic : atomicOp, atomicLoad;
Expand Down
2 changes: 1 addition & 1 deletion src/utils/std/experimental/containers/map.d
@@ -1,5 +1,5 @@
module std.experimental.containers.map;
import std.experimental.allocator : IAllocator, ISharedAllocator, theAllocator, processAllocator, make, dispose, makeArray, shrinkArray, expandArray;
import stdx.allocator : IAllocator, ISharedAllocator, theAllocator, processAllocator, make, dispose, makeArray, shrinkArray, expandArray;
import devisualization.util.core.memory.managed;
import std.traits : isArray, isPointer;
import core.atomic : atomicOp, atomicLoad;
Expand Down