Updates

Author: inactive123

features/features_cpu.c

@@ -225,7 +225,7 @@ retro_time_t cpu_features_get_time_usec(void)
 
    if (!QueryPerformanceCounter(&count))
       return 0;
-   return count.QuadPart * 1000000 / freq.QuadPart;
+   return (count.QuadPart / freq.QuadPart * 1000000) + (count.QuadPart % freq.QuadPart * 1000000 / freq.QuadPart);
 #elif defined(__CELLOS_LV2__)
    return sys_time_get_system_time();
 #elif defined(GEKKO)

hash/rhash.c

@@ -307,7 +307,22 @@ uint32_t crc32_calculate(const uint8_t *data, size_t length)
 /* Define the circular shift macro */
 #define SHA1CircularShift(bits,word) ((((word) << (bits)) & 0xFFFFFFFF) | ((word) >> (32-(bits))))
 
-static void SHA1Reset(SHA1Context *context)
+struct sha1_context
+{
+   unsigned Message_Digest[5]; /* Message Digest (output)          */
+
+   unsigned Length_Low;        /* Message length in bits           */
+   unsigned Length_High;       /* Message length in bits           */
+
+   unsigned char Message_Block[64]; /* 512-bit message blocks      */
+   int Message_Block_Index;    /* Index into message block array   */
+
+   int Computed;               /* Is the digest computed?          */
+   int Corrupted;              /* Is the message digest corruped?  */
+};
+
+
+static void SHA1Reset(struct sha1_context *context)
 {
    if (!context)
       return;
@@ -326,7 +341,7 @@ static void SHA1Reset(SHA1Context *context)
    context->Corrupted  = 0;
 }
 
-static void SHA1ProcessMessageBlock(SHA1Context *context)
+static void SHA1ProcessMessageBlock(struct sha1_context *context)
 {
    const unsigned K[] =            /* Constants defined in SHA-1   */
    {
@@ -418,7 +433,7 @@ static void SHA1ProcessMessageBlock(SHA1Context *context)
    context->Message_Block_Index = 0;
 }
 
-static void SHA1PadMessage(SHA1Context *context)
+static void SHA1PadMessage(struct sha1_context *context)
 {
    if (!context)
       return;
@@ -455,7 +470,7 @@ static void SHA1PadMessage(SHA1Context *context)
    SHA1ProcessMessageBlock(context);
 }
 
-static int SHA1Result(SHA1Context *context)
+static int SHA1Result(struct sha1_context *context)
 {
    if (context->Corrupted)
       return 0;
@@ -469,7 +484,7 @@ static int SHA1Result(SHA1Context *context)
    return 1;
 }
 
-static void SHA1Input(SHA1Context *context,
+static void SHA1Input(struct sha1_context *context,
       const unsigned char *message_array,
       unsigned length)
 {
@@ -508,7 +523,7 @@ static void SHA1Input(SHA1Context *context,
 
 int sha1_calculate(const char *path, char *result)
 {
-   SHA1Context sha;
+   struct sha1_context sha;
    unsigned char buff[4096];
    int rv    = 1;
    RFILE *fd = filestream_open(path,

include/queues/task_queue.h

@@ -30,6 +30,8 @@
 #include <retro_common.h>
 #include <retro_common_api.h>
 
+#include <libretro.h>
+
 RETRO_BEGIN_DECLS
 
 enum task_type
@@ -125,6 +127,9 @@ struct retro_task
 
    /* don't touch this. */
    retro_task_t *next;
+
+   /* when the task should run (0 for as soon as possible) */
+   retro_time_t when;
 };
 
 typedef struct task_finder_data

include/rhash.h

@@ -20,31 +20,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/*
- *  sha1.h
- *
- *  Copyright (C) 1998, 2009
- *  Paul E. Jones <[email protected]>
- *  All Rights Reserved
- *
- *****************************************************************************
- *  $Id: sha1.h 12 2009-06-22 19:34:25Z paulej $
- *****************************************************************************
- *
- *  Description:
- *      This class implements the Secure Hashing Standard as defined
- *      in FIPS PUB 180-1 published April 17, 1995.
- *
- *      Many of the variable names in the SHA1Context, especially the
- *      single character names, were used because those were the names
- *      used in the publication.
- *
- *      Please read the file sha1.c for more information.
- *
- */
-
-#ifndef __RARCH_HASH_H
-#define __RARCH_HASH_H
+#ifndef __LIBRETRO_SDK_HASH_H
+#define __LIBRETRO_SDK_HASH_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -70,20 +47,6 @@ RETRO_BEGIN_DECLS
  **/
 void sha256_hash(char *out, const uint8_t *in, size_t size);
 
-typedef struct SHA1Context
-{
-   unsigned Message_Digest[5]; /* Message Digest (output)          */
-
-   unsigned Length_Low;        /* Message length in bits           */
-   unsigned Length_High;       /* Message length in bits           */
-
-   unsigned char Message_Block[64]; /* 512-bit message blocks      */
-   int Message_Block_Index;    /* Index into message block array   */
-
-   int Computed;               /* Is the digest computed?          */
-   int Corrupted;              /* Is the message digest corruped?  */
-} SHA1Context;
-
 int sha1_calculate(const char *path, char *result);
 
 uint32_t djb2_calculate(const char *str);

queues/task_queue.c

@@ -26,6 +26,8 @@
 
 #include <queues/task_queue.h>
 
+#include <features/features_cpu.h>
+
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
 #define SLOCK_LOCK(x) slock_lock(x)
@@ -112,7 +114,24 @@ static void task_queue_put(task_queue_t *queue, retro_task_t *task)
    task->next = NULL;
 
    if (queue->front)
+   {
+      /* Make sure to insert in order - the queue is sorted by 'when' so items that aren't scheduled
+       * to run immediately are at the back of the queue. Items with the same 'when' are inserted after
+       * all the other items with the same 'when'. This primarily affects items with a 'when' of 0.
+       */
+      if (queue->back->when > task->when)
+      {
+         retro_task_t** prev = &queue->front;
+         while (*prev && (*prev)->when <= task->when)
+            prev = &((*prev)->next);
+
+         task->next = *prev;
+         *prev = task;
+         return;
+      }
+
       queue->back->next = task;
+   }
    else
       queue->front = task;
 
@@ -181,9 +200,13 @@ static void retro_task_regular_gather(void)
    for (task = queue; task; task = next)
    {
       next = task->next;
-      task->handler(task);
 
-      task_queue_push_progress(task);
+      if (!task->when || task->when < cpu_features_get_time_usec())
+      {
+         task->handler(task);
+
+         task_queue_push_progress(task);
+      }
 
       if (task->finished)
          task_queue_put(&tasks_finished, task);
@@ -304,9 +327,10 @@ static void task_queue_remove(task_queue_t *queue, retro_task_t *task)
    {
       slock_lock(queue_lock);
       queue->front = task->next;
+      if (queue->back == task) /* if only element, also update back */
+         queue->back = NULL;
       slock_unlock(queue_lock);
       task->next   = NULL;
-
       return;
    }
 
@@ -320,6 +344,15 @@ static void task_queue_remove(task_queue_t *queue, retro_task_t *task)
       {
          t->next    = task->next;
          task->next = NULL;
+
+         /* When removing the tail of the queue, update the tail pointer */
+         if (queue->back == task)
+         {
+            slock_lock(queue_lock);
+            if (queue->back == task)
+               queue->back = t;
+            slock_unlock(queue_lock);
+         }
          break;
       }
 
@@ -453,6 +486,18 @@ static void threaded_worker(void *userdata)
          continue;
       }
 
+      if (task->when)
+      {
+         retro_time_t now = cpu_features_get_time_usec();
+         retro_time_t delay = task->when - now - 500; /* allow half a millisecond for context switching */
+         if (delay > 0)
+         {
+            scond_wait_timeout(worker_cond, running_lock, delay);
+            slock_unlock(running_lock);
+            continue;
+         }
+      }
+
       slock_unlock(running_lock);
 
       task->handler(task);