Code consistency improvements

Author: dougbinks

README.md

@@ -67,7 +67,7 @@ enki::TaskScheduler g_TS;
 
 // define a task set, can ignore range if we only do one thing
 struct ParallelTaskSet : enki::ITaskSet {
-    virtual void    ExecuteRange(  enki::TaskSetPartition range, uint32_t threadnum ) {
+    void ExecuteRange(  enki::TaskSetPartition range_, uint32_t threadnum_ ) override {
         // do something here, can issue tasks with g_TS
     }
 };
@@ -94,7 +94,7 @@ enki::TaskScheduler g_TS;
 int main(int argc, const char * argv[]) {
    g_TS.Initialize();
 
-   enki::TaskSet task( 1, []( enki::TaskSetPartition range, uint32_t threadnum  ) {
+   enki::TaskSet task( 1, []( enki::TaskSetPartition range_, uint32_t threadnum_  ) {
          // do something here
       }  );
 
@@ -117,7 +117,7 @@ struct ExampleTask : enki::ITaskSet
 {
     ExampleTask( ) { m_SetSize = size_; }
 
-    virtual void ExecuteRange( enki::TaskSetPartition range, uint32_t threadnum ) {
+    void ExecuteRange(  enki::TaskSetPartition range_, uint32_t threadnum_ ) override {
         // See full example in Priorities.cpp
     }
 };
@@ -161,7 +161,7 @@ enki::TaskScheduler g_TS;
 
 // define a task set, can ignore range if we only do one thing
 struct PinnedTask : enki::IPinnedTask {
-    virtual void    Execute() {
+    void Execute() override {
       // do something here, can issue tasks with g_TS
     }
 };
@@ -192,14 +192,14 @@ enki::TaskScheduler g_TS;
 
 // define a task set, can ignore range if we only do one thing
 struct TaskA : enki::ITaskSet {
-    virtual void    ExecuteRange(  enki::TaskSetPartition range, uint32_t threadnum ) {
+    void ExecuteRange(  enki::TaskSetPartition range_, uint32_t threadnum_ ) override {
         // do something here, can issue tasks with g_TS
     }
 };
 
 struct TaskB : enki::ITaskSet {
     enki::Dependency m_Dependency;
-    virtual void    ExecuteRange(  enki::TaskSetPartition range, uint32_t threadnum ) {
+    void ExecuteRange(  enki::TaskSetPartition range_, uint32_t threadnum_ ) override {
         // do something here, can issue tasks with g_TS
     }
 };
@@ -227,8 +227,7 @@ External thread usage in C++:
 enki::TaskScheduler g_TS;
 struct ParallelTaskSet : ITaskSet
 {
-    virtual void ExecuteRange( TaskSetPartition range, uint32_t threadnum )
-    {
+    void ExecuteRange(  enki::TaskSetPartition range_, uint32_t threadnum_ ) override {
         // Do something
     }
 };
@@ -268,7 +267,7 @@ C usage:
 
 enkiTaskScheduler*	g_pTS;
 
-void ParalleTaskSetFunc( uint32_t start_, uint32_t end, uint32_t threadnum_, void* pArgs_ ) {
+void ParalleTaskSetFunc( uint32_t start_, uint32_t end_, uint32_t threadnum_, void* pArgs_ ) {
    /* Do something here, can issue tasks with g_pTS */
 }
 

example/CompletionAction.cpp

@@ -70,11 +70,11 @@ struct SelfDeletingTaskB : ITaskSet
         printf("~SelfDeletingTaskB() called on thread %u\n\n", g_TS.GetThreadNum() );
     }
 
-    void ExecuteRange( TaskSetPartition range, uint32_t threadnum ) override
+    void ExecuteRange( TaskSetPartition range_, uint32_t threadnum_ ) override
     {
-        (void)range;
+        (void)range_;
         ++gs_CountBsRun;
-        printf("SelfDeletingTaskB on thread %u\n", threadnum);
+        printf("SelfDeletingTaskB on thread %u\n", threadnum_);
     }
 
     CompletionActionDelete m_TaskDeleter;
@@ -97,11 +97,11 @@ struct SelfDeletingTaskA : ITaskSet
         printf("~SelfDeletingTaskA() called on thread %u\n\n", g_TS.GetThreadNum() );
     }
 
-    void ExecuteRange( TaskSetPartition range, uint32_t threadnum ) override
+    void ExecuteRange( TaskSetPartition range_, uint32_t threadnum_ ) override
     {
-        (void)range;
+        (void)range_;
         ++gs_CountAsRun;
-        printf("SelfDeletingTaskA on thread %u\n", threadnum);
+        printf("SelfDeletingTaskA on thread %u\n", threadnum_);
     }
 
     CompletionActionDelete m_TaskDeleter;

example/CustomAllocator_c.c

@@ -51,7 +51,7 @@ void* CustomAllocFunc( size_t align_, size_t size_, void* userData_, const char*
     return enkiDefaultAllocFunc( align_, size_, userData_, file_, line_ );
 };
 
-void  CustomFreeFunc(  void* ptr_,    size_t size_, void* userData_, const char* file_, int line_ )
+void  CustomFreeFunc(  void* ptr_, size_t size_, void* userData_, const char* file_, int line_ )
 {
     totalAllocations -= size_; // note this isn't thread safe, should use atomics in real application
 

example/ParallelSum_c.c

@@ -30,15 +30,15 @@ typedef struct ParallelSumTaskSetArgs
     uint32_t  numPartialSums;
 } ParallelSumTaskSetArgs;
 
-void ParallelSumTaskSetFunc( uint32_t start_, uint32_t end, uint32_t threadnum_, void* pArgs_ )
+void ParallelSumTaskSetFunc( uint32_t start_, uint32_t end_, uint32_t threadnum_, void* pArgs_ )
 {
     ParallelSumTaskSetArgs args;
     uint64_t sum, i;
 
     args = *(ParallelSumTaskSetArgs*)pArgs_;
 
     sum = args.pPartialSums[threadnum_];
-    for( i = start_; i < end; ++i )
+    for( i = start_; i < end_; ++i )
     {
         sum += i + 1;
     }
@@ -53,7 +53,7 @@ typedef struct ParallelReductionSumTaskSetArgs
     uint64_t               sum;
 } ParallelReductionSumTaskSetArgs;
 
-void ParallelReductionSumTaskSetFunc(  uint32_t start_, uint32_t end, uint32_t threadnum_, void* pArgs_ )
+void ParallelReductionSumTaskSetFunc(  uint32_t start_, uint32_t end_, uint32_t threadnum_, void* pArgs_ )
 {
     ParallelReductionSumTaskSetArgs* pArgs;
     uint64_t sum, i;

src/TaskScheduler_c.h

@@ -53,7 +53,7 @@ typedef struct enkiCompletable      enkiCompletable;
 typedef struct enkiDependency       enkiDependency;
 typedef struct enkiCompletionAction enkiCompletionAction;
 
-typedef void (* enkiTaskExecuteRange)( uint32_t start_, uint32_t end, uint32_t threadnum_, void* pArgs_ );
+typedef void (* enkiTaskExecuteRange)( uint32_t start_, uint32_t end_, uint32_t threadnum_, void* pArgs_ );
 typedef void (* enkiPinnedTaskExecute)( void* pArgs_ );
 typedef void (* enkiCompletionFunction)( void* pArgs_, uint32_t threadNum_ );