Skip to content

Commit

Permalink
Mir & BetterC rework: generic building blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@9il
9il committed Oct 24, 2018
1 parent fae6883 commit c7206e1
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 53 deletions.
24 changes: 12 additions & 12 deletions source/stdx/allocator/building_blocks/null_allocator.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,44 +20,44 @@ struct NullAllocator
//size_t goodAllocSize(size_t n) shared const
//{ return .goodAllocSize(this, n); }
/// Always returns $(D null).
static void[] allocate(size_t) { return null; }
static void[] allocate()(size_t) { return null; }
/// Always returns $(D null).
static void[] alignedAllocate(size_t, uint) { return null; }
static void[] alignedAllocate()(size_t, uint) { return null; }
/// Always returns $(D null).
static void[] allocateAll() { return null; }
static void[] allocateAll()() { return null; }
/**
These methods return $(D false).
Precondition: $(D b is null). This is because there is no other possible
legitimate input.
*/
static bool expand(ref void[] b, size_t s)
static bool expand()(ref void[] b, size_t s)
{ assert(b is null); return s == 0; }
/// Ditto
static bool reallocate(ref void[] b, size_t)
static bool reallocate()(ref void[] b, size_t)
{ assert(b is null); return false; }
/// Ditto
static bool alignedReallocate(ref void[] b, size_t, uint)
static bool alignedReallocate()(ref void[] b, size_t, uint)
{ assert(b is null); return false; }
/// Returns $(D Ternary.no).
static Ternary owns(void[]) { return Ternary.no; }
static Ternary owns()(void[]) { return Ternary.no; }
/**
Returns $(D Ternary.no).
*/
static Ternary resolveInternalPointer(const void*, ref void[])
static Ternary resolveInternalPointer()(const void*, ref void[])
{ return Ternary.no; }
/**
No-op.
Precondition: $(D b is null)
*/
static bool deallocate(void[] b) { assert(b is null); return true; }
static bool deallocate()(void[] b) { assert(b is null); return true; }
/**
No-op.
*/
static bool deallocateAll() { return true; }
static bool deallocateAll()() { return true; }
/**
Returns $(D Ternary.yes).
*/
static Ternary empty() { return Ternary.yes; }
static Ternary empty()() { return Ternary.yes; }
/**
Returns the $(D static) global instance of the $(D NullAllocator).
*/
Expand All @@ -75,7 +75,7 @@ struct NullAllocator
assert(!NullAllocator.instance.reallocate(b, 42));
assert(!NullAllocator.instance.alignedReallocate(b, 42, 0));
NullAllocator.instance.deallocate(b);
NullAllocator.instance.deallocateAll();
assert(NullAllocator.instance.deallocateAll() == true);

import stdx.allocator.internal : Ternary;
assert(NullAllocator.instance.empty() == Ternary.yes);
Expand Down
36 changes: 22 additions & 14 deletions source/stdx/allocator/common.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ size_t goodAllocSize(A)(auto ref A a, size_t n)
Returns s rounded up to a multiple of base.
*/
@safe @nogc nothrow pure
package size_t roundUpToMultipleOf(size_t s, uint base)
package size_t roundUpToMultipleOf()(size_t s, uint base)
{
assert(base);
auto rem = s % base;
Expand All @@ -112,7 +112,7 @@ unittest
Returns `n` rounded up to a multiple of alignment, which must be a power of 2.
*/
@safe @nogc nothrow pure
package size_t roundUpToAlignment(size_t n, uint alignment)
package size_t roundUpToAlignment()(size_t n, uint alignment)
{
import stdx.allocator.internal : isPowerOf2;
assert(alignment.isPowerOf2);
Expand All @@ -137,7 +137,7 @@ unittest
Returns `n` rounded down to a multiple of alignment, which must be a power of 2.
*/
@safe @nogc nothrow pure
package size_t roundDownToAlignment(size_t n, uint alignment)
package size_t roundDownToAlignment()(size_t n, uint alignment)
{
import stdx.allocator.internal : isPowerOf2;
assert(alignment.isPowerOf2);
Expand All @@ -159,7 +159,7 @@ may therefore be shorter. Returns the adjusted buffer, or null if obtaining a
non-empty buffer is impossible.
*/
@nogc nothrow pure
package void[] roundUpToAlignment(void[] b, uint a)
package void[] roundUpToAlignment()(void[] b, uint a)
{
auto e = b.ptr + b.length;
auto p = cast(void*) roundUpToAlignment(cast(size_t) b.ptr, a);
Expand Down Expand Up @@ -191,7 +191,7 @@ package size_t divideRoundUp(size_t a, size_t b)
Returns `s` rounded up to a multiple of `base`.
*/
@nogc nothrow pure
package void[] roundStartToMultipleOf(void[] s, uint base)
package void[] roundStartToMultipleOf()(void[] s, uint base)
{
assert(base);
auto p = cast(void*) roundUpToMultipleOf(
Expand All @@ -213,7 +213,7 @@ nothrow pure
Returns $(D s) rounded up to the nearest power of 2.
*/
@safe @nogc nothrow pure
package size_t roundUpToPowerOf2(size_t s)
package size_t roundUpToPowerOf2()(size_t s)
{
import std.meta : AliasSeq;
assert(s <= (size_t.max >> 1) + 1);
Expand Down Expand Up @@ -250,7 +250,7 @@ unittest
Returns the number of trailing zeros of $(D x).
*/
@safe @nogc nothrow pure
package uint trailingZeros(ulong x)
package uint trailingZeros()(ulong x)
{
uint result;
while (result < 64 && !(x & (1UL << result)))
Expand Down Expand Up @@ -284,7 +284,7 @@ Returns the effective alignment of `ptr`, i.e. the largest power of two that is
a divisor of `ptr`.
*/
@nogc nothrow pure
package uint effectiveAlignment(void* ptr)
package uint effectiveAlignment()(void* ptr)
{
return 1U << trailingZeros(cast(size_t) ptr);
}
Expand All @@ -301,7 +301,7 @@ Aligns a pointer down to a specified alignment. The resulting pointer is less
than or equal to the given pointer.
*/
@nogc nothrow pure
package void* alignDownTo(void* ptr, uint alignment)
package void* alignDownTo()(void* ptr, uint alignment)
{
import stdx.allocator.internal : isPowerOf2;
assert(alignment.isPowerOf2);
Expand All @@ -313,7 +313,7 @@ Aligns a pointer up to a specified alignment. The resulting pointer is greater
than or equal to the given pointer.
*/
@nogc nothrow pure
package void* alignUpTo(void* ptr, uint alignment)
package void* alignUpTo()(void* ptr, uint alignment)
{
import stdx.allocator.internal : isPowerOf2;
assert(alignment.isPowerOf2);
Expand All @@ -322,14 +322,14 @@ package void* alignUpTo(void* ptr, uint alignment)
}

@safe @nogc nothrow pure
package bool isGoodStaticAlignment(uint x)
package bool isGoodStaticAlignment()(uint x)
{
import stdx.allocator.internal : isPowerOf2;
return x.isPowerOf2;
}

@safe @nogc nothrow pure
package bool isGoodDynamicAlignment(uint x)
package bool isGoodDynamicAlignment()(uint x)
{
import stdx.allocator.internal : isPowerOf2;
return x.isPowerOf2 && x >= (void*).sizeof;
Expand Down Expand Up @@ -409,9 +409,17 @@ Forwards each of the methods in `funs` (if defined) to `member`.
{
result ~= "
static if (hasMember!(typeof("~member~"), `"~fun~"`))
auto ref "~fun~"(Parameters!(typeof("~member~"."~fun~")) args)
{
return "~member~"."~fun~"(args);
static if (__traits(isTemplate, "~member~"."~fun~"))
auto ref "~fun~"(Parameters!(typeof("~member~"."~fun~"!())) args)
{
return "~member~"."~fun~"(args);
}
else
auto ref "~fun~"(Parameters!(typeof("~member~"."~fun~")) args)
{
return "~member~"."~fun~"(args);
}
}\n";
}
return result;
Expand Down
14 changes: 7 additions & 7 deletions source/stdx/allocator/gc_allocator.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ struct GCAllocator
deallocate) and $(D reallocate) methods are $(D @system) because they may
move memory around, leaving dangling pointers in user code.
*/
static pure nothrow @trusted void[] allocate(size_t bytes)
static pure nothrow @trusted void[] allocate()(size_t bytes)
{
if (!bytes) return null;
auto p = GC.malloc(bytes);
return p ? p[0 .. bytes] : null;
}

/// Ditto
static @system bool expand(ref void[] b, size_t delta)
static @system bool expand()(ref void[] b, size_t delta)
{
if (delta == 0) return true;
if (b is null) return false;
Expand All @@ -53,7 +53,7 @@ struct GCAllocator
}

/// Ditto
static pure nothrow @system bool reallocate(ref void[] b, size_t newSize)
static pure nothrow @system bool reallocate()(ref void[] b, size_t newSize)
{
import core.exception : OutOfMemoryError;
try
Expand All @@ -71,7 +71,7 @@ struct GCAllocator

/// Ditto
pure nothrow
static Ternary resolveInternalPointer(const void* p, ref void[] result)
static Ternary resolveInternalPointer()(const void* p, ref void[] result)
{
auto r = GC.addrOf(cast(void*) p);
if (!r) return Ternary.no;
Expand All @@ -80,14 +80,14 @@ struct GCAllocator
}

/// Ditto
static pure nothrow @system bool deallocate(void[] b)
static pure nothrow @system bool deallocate()(void[] b)
{
GC.free(b.ptr);
return true;
}

/// Ditto
static size_t goodAllocSize(size_t n)
static size_t goodAllocSize()(size_t n)
{
if (n == 0)
return 0;
Expand All @@ -112,7 +112,7 @@ struct GCAllocator
enum GCAllocator instance = GCAllocator();

// Leave it undocummented for now.
static nothrow @trusted void collect()
static nothrow @trusted void collect()()
{
GC.collect();
}
Expand Down
30 changes: 15 additions & 15 deletions source/stdx/allocator/mallocator.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct Mallocator
programs that can afford to leak memory allocated.
*/
@trusted @nogc nothrow
static void[] allocate(size_t bytes)
static void[] allocate()(size_t bytes)
{
import core.stdc.stdlib : malloc;
if (!bytes) return null;
Expand All @@ -33,7 +33,7 @@ struct Mallocator

/// Ditto
@system @nogc nothrow
static bool deallocate(void[] b)
static bool deallocate()(void[] b)
{
import core.stdc.stdlib : free;
free(b.ptr);
Expand All @@ -42,7 +42,7 @@ struct Mallocator

/// Ditto
@system @nogc nothrow
static bool reallocate(ref void[] b, size_t s)
static bool reallocate()(ref void[] b, size_t s)
{
import core.stdc.stdlib : realloc;
if (!s)
Expand Down Expand Up @@ -124,14 +124,14 @@ version (Windows)
size_t size;

@nogc nothrow
static AlignInfo* opCall(void* ptr)
static AlignInfo* opCall()(void* ptr)
{
return cast(AlignInfo*) (ptr - AlignInfo.sizeof);
}
}

@nogc nothrow
private void* _aligned_malloc(size_t size, size_t alignment)
private void* _aligned_malloc()(size_t size, size_t alignment)
{
import core.stdc.stdlib : malloc;
size_t offset = alignment + size_t.sizeof * 2 - 1;
Expand All @@ -153,7 +153,7 @@ version (Windows)
}

@nogc nothrow
private void* _aligned_realloc(void* ptr, size_t size, size_t alignment)
private void* _aligned_realloc()(void* ptr, size_t size, size_t alignment)
{
import core.stdc.stdlib : free;
import core.stdc.string : memcpy;
Expand All @@ -180,7 +180,7 @@ version (Windows)
}

@nogc nothrow
private void _aligned_free(void *ptr)
private void _aligned_free()(void *ptr)
{
import core.stdc.stdlib : free;
if (!ptr) return;
Expand Down Expand Up @@ -214,7 +214,7 @@ struct AlignedMallocator
Forwards to $(D alignedAllocate(bytes, platformAlignment)).
*/
@trusted @nogc nothrow
static void[] allocate(size_t bytes)
static void[] allocate()(size_t bytes)
{
if (!bytes) return null;
return alignedAllocate(bytes, alignment);
Expand All @@ -228,7 +228,7 @@ struct AlignedMallocator
*/
version(Posix)
@trusted @nogc nothrow
static void[] alignedAllocate(size_t bytes, uint a)
static void[] alignedAllocate()(size_t bytes, uint a)
{
import core.stdc.errno : ENOMEM, EINVAL;
assert(a.isGoodDynamicAlignment);
Expand All @@ -250,7 +250,7 @@ struct AlignedMallocator
}
else version(Windows)
@trusted @nogc nothrow
static void[] alignedAllocate(size_t bytes, uint a)
static void[] alignedAllocate()(size_t bytes, uint a)
{
auto result = _aligned_malloc(bytes, a);
return result ? result[0 .. bytes] : null;
Expand All @@ -264,15 +264,15 @@ struct AlignedMallocator
*/
version (Posix)
@system @nogc nothrow
static bool deallocate(void[] b)
static bool deallocate()(void[] b)
{
import core.stdc.stdlib : free;
free(b.ptr);
return true;
}
else version (Windows)
@system @nogc nothrow
static bool deallocate(void[] b)
static bool deallocate()(void[] b)
{
_aligned_free(b.ptr);
return true;
Expand All @@ -285,13 +285,13 @@ struct AlignedMallocator
*/
version (Posix)
@system @nogc nothrow
static bool reallocate(ref void[] b, size_t newSize)
static bool reallocate()(ref void[] b, size_t newSize)
{
return Mallocator.instance.reallocate(b, newSize);
}
version (Windows)
@system @nogc nothrow
static bool reallocate(ref void[] b, size_t newSize)
static bool reallocate()(ref void[] b, size_t newSize)
{
return alignedReallocate(b, newSize, alignment);
}
Expand All @@ -304,7 +304,7 @@ struct AlignedMallocator
*/
version (Windows)
@system @nogc nothrow
static bool alignedReallocate(ref void[] b, size_t s, uint a)
static bool alignedReallocate()(ref void[] b, size_t s, uint a)
{
if (!s)
{
Expand Down
Loading

0 comments on commit c7206e1

Please sign in to comment.