diff options
Diffstat (limited to 'src/Mayaqua/Memory.c')
| -rw-r--r-- | src/Mayaqua/Memory.c | 157 |
1 files changed, 110 insertions, 47 deletions
diff --git a/src/Mayaqua/Memory.c b/src/Mayaqua/Memory.c index 4e1f332b..9171c410 100644 --- a/src/Mayaqua/Memory.c +++ b/src/Mayaqua/Memory.c @@ -129,11 +129,60 @@ #define FIFO_INIT_MEM_SIZE 4096
#define FIFO_REALLOC_MEM_SIZE (65536 * 10) // Exquisite value
-#define FIFO_REALLOC_MEM_SIZE_SMALL 65536
#define INIT_NUM_RESERVED 32
-static UINT fifo_default_realloc_mem_size = FIFO_REALLOC_MEM_SIZE;
+static UINT fifo_current_realloc_mem_size = FIFO_REALLOC_MEM_SIZE;
+
+// Check whether the specified key item is in the hash list
+bool IsInHashListKey(HASH_LIST *h, UINT key)
+{
+ // Validate arguments
+ if (h == NULL || key == 0)
+ {
+ return false;
+ }
+
+ if (HashListKeyToPointer(h, key) == NULL)
+ {
+ return false;
+ }
+
+ return true;
+}
+
+// Search the item in the hash list with the key
+void *HashListKeyToPointer(HASH_LIST *h, UINT key)
+{
+ UINT num, i;
+ void **pp;
+ void *ret = NULL;
+ // Validate arguments
+ if (h == NULL || key == 0)
+ {
+ return NULL;
+ }
+
+ pp = HashListToArray(h, &num);
+ if (pp == NULL)
+ {
+ return NULL;
+ }
+
+ for (i = 0;i < num;i++)
+ {
+ void *p = pp[i];
+
+ if (POINTER_TO_KEY(p) == key)
+ {
+ ret = p;
+ }
+ }
+
+ Free(pp);
+
+ return ret;
+}
// Lock the hash list
void LockHashList(HASH_LIST *h)
@@ -223,17 +272,11 @@ void *SearchHash(HASH_LIST *h, void *t) if (h->Entries[r] != NULL)
{
LIST *o = h->Entries[r];
- UINT i;
+ void *r = Search(o, t);
- for (i = 0;i < LIST_NUM(o);i++)
+ if (r != NULL)
{
- void *p = LIST_DATA(o, i);
-
- if (h->CompareProc(&p, &t) == 0)
- {
- ret = p;
- break;
- }
+ ret = r;
}
}
@@ -293,10 +336,10 @@ void AddHash(HASH_LIST *h, void *p) if (h->Entries[r] == NULL)
{
- h->Entries[r] = NewListFast(NULL);
+ h->Entries[r] = NewListFast(h->CompareProc);
}
- Add(h->Entries[r], p);
+ Insert(h->Entries[r], p);
if (h->AllList != NULL)
{
@@ -1031,6 +1074,18 @@ void *PeekQueue(QUEUE *q) return p;
}
+// Get the number of queued items
+UINT GetQueueNum(QUEUE *q)
+{
+ // Validate arguments
+ if (q == NULL)
+ {
+ return 0;
+ }
+
+ return q->num_item;
+}
+
// Get one
void *GetNext(QUEUE *q)
{
@@ -1105,6 +1160,21 @@ void InsertQueue(QUEUE *q, void *p) q->num_item++;
+ /*{
+ static UINT max_num_item;
+ static UINT64 next_tick = 0;
+ UINT64 now = Tick64();
+
+ max_num_item = MAX(q->num_item, max_num_item);
+
+ if (next_tick == 0 || next_tick <= now)
+ {
+ next_tick = now + (UINT64)1000;
+
+ printf("max_queue = %u\n", max_num_item);
+ }
+ }*/
+
// KS
KS_INC(KS_INSERT_QUEUE_COUNT);
}
@@ -2327,9 +2397,26 @@ UINT ReadFifo(FIFO *f, void *p, UINT size) f->pos = 0;
}
+ ShrinkFifoMemory(f);
+
+ // KS
+ KS_INC(KS_READ_FIFO_COUNT);
+
+ return read_size;
+}
+
+// Rearrange the memory
+void ShrinkFifoMemory(FIFO *f)
+{
+ // Validate arguments
+ if (f == NULL)
+ {
+ return;
+ }
+
// Rearrange the memory
- if (f->pos >= FIFO_INIT_MEM_SIZE &&
- f->memsize >= f->realloc_mem_size &&
+ if (f->pos >= FIFO_INIT_MEM_SIZE &&
+ f->memsize >= fifo_current_realloc_mem_size &&
(f->memsize / 2) > f->size)
{
void *new_p;
@@ -2345,11 +2432,6 @@ UINT ReadFifo(FIFO *f, void *p, UINT size) f->p = new_p;
f->pos = 0;
}
-
- // KS
- KS_INC(KS_READ_FIFO_COUNT);
-
- return read_size;
}
// Write to the FIFO
@@ -2497,19 +2579,19 @@ void CleanupFifo(FIFO *f) // Initialize the FIFO system
void InitFifo()
{
- fifo_default_realloc_mem_size = FIFO_REALLOC_MEM_SIZE;
+ fifo_current_realloc_mem_size = FIFO_REALLOC_MEM_SIZE;
}
// Create a FIFO
FIFO *NewFifo()
{
- return NewFifoEx(0, false);
+ return NewFifoEx(false);
}
FIFO *NewFifoFast()
{
- return NewFifoEx(0, true);
+ return NewFifoEx(true);
}
-FIFO *NewFifoEx(UINT realloc_mem_size, bool fast)
+FIFO *NewFifoEx(bool fast)
{
FIFO *f;
@@ -2531,13 +2613,6 @@ FIFO *NewFifoEx(UINT realloc_mem_size, bool fast) f->memsize = FIFO_INIT_MEM_SIZE;
f->p = Malloc(FIFO_INIT_MEM_SIZE);
- if (realloc_mem_size == 0)
- {
- realloc_mem_size = fifo_default_realloc_mem_size;
- }
-
- f->realloc_mem_size = realloc_mem_size;
-
#ifndef DONT_USE_KERNEL_STATUS
// TrackNewObj(POINTER_TO_UINT64(f), "FIFO", 0);
#endif // DONT_USE_KERNEL_STATUS
@@ -2549,20 +2624,20 @@ FIFO *NewFifoEx(UINT realloc_mem_size, bool fast) }
// Get the default memory reclaiming size of the FIFO
-UINT GetFifoDefaultReallocMemSize()
+UINT GetFifoCurrentReallocMemSize()
{
- return fifo_default_realloc_mem_size;
+ return fifo_current_realloc_mem_size;
}
// Set the default memory reclaiming size of the FIFO
-void SetFifoDefaultReallocMemSize(UINT size)
+void SetFifoCurrentReallocMemSize(UINT size)
{
if (size == 0)
{
size = FIFO_REALLOC_MEM_SIZE;
}
- fifo_default_realloc_mem_size = size;
+ fifo_current_realloc_mem_size = size;
}
// Read a buffer from a file
@@ -3743,12 +3818,6 @@ char B64_CharToCode(char c) return 0;
}
-// High-speed Malloc (currently not implemented)
-void *MallocFast(UINT size)
-{
- return Malloc(size);
-}
-
// Malloc
void *Malloc(UINT size)
{
@@ -3899,12 +3968,6 @@ void *ZeroMallocEx(UINT size, bool zero_clear_when_free) Zero(p, size);
return p;
}
-void *ZeroMallocFast(UINT size)
-{
- void *p = MallocFast(size);
- Zero(p, size);
- return p;
-}
// Memory allocation
void *InternalMalloc(UINT size)
|