Mercurial > hg > Game > Cerium

changeset 2027:cd2ef2861eb1 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix indent in HelloWorld
author Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
date Tue, 02 Sep 2014 16:39:06 +0900
parents 652dd569acc1
children 131d90cc3f85
files example/HelloWorld/Func.h example/HelloWorld/main.cc example/HelloWorld/ppe/task_init.cc example/HelloWorld/task_init.cc
diffstat 4 files changed, 109 insertions(+), 137 deletions(-) [+]
line wrap: on
line diff
--- a/example/HelloWorld/Func.h	Sun Aug 10 18:44:47 2014 +0900
+++ b/example/HelloWorld/Func.h	Tue Sep 02 16:39:06 2014 +0900
@@ -1,6 +1,6 @@
 enum {
 #include "SysTasks.h"
-    Hello,
+    HELLO_TASK,
     RUN_FINISH,
 };
 
--- a/example/HelloWorld/main.cc	Sun Aug 10 18:44:47 2014 +0900
+++ b/example/HelloWorld/main.cc	Tue Sep 02 16:39:06 2014 +0900
@@ -20,172 +20,144 @@
 init(int argc, char **argv)
 {
     for (int i = 1; argv[i]; ++i) {
-	if (strcmp(argv[i], "-count") == 0) {
+        if (strcmp(argv[i], "-count") == 0) {
             count = atoi(argv[++i]);
         } else if (strcmp(argv[i], "-cpu") == 0) {
-	    spe_num = atoi(argv[i+1]);
-	} else if (strcmp(argv[i], "-t") == 0) {
-	    use_task_creater = 1;
-	} 
-
-
-
+            spe_num = atoi(argv[i+1]);
+        } else if (strcmp(argv[i], "-t") == 0) {
+            use_task_creater = 1;
+        }
     }
-
     return 0;
 }
 
 
-static void simple_task_creater(int in_total_size, int out_total_size, 
-                                int command, int in_data_size, int out_data_size, 
-                                void *in_data, void *out_data, TaskManager *manager,
-                                HTask *wait_i, HTask *wait_me) {
-    
-    
+static void
+simple_task_creater(int in_total_size, int out_total_size, 
+                        int command, int in_data_size, int out_data_size, 
+                        void *in_data, void *out_data, TaskManager *manager,
+                        HTask *wait_i, HTask *wait_me)
+{
     int in_task_size = 0;
     int out_task_size = 0;
-    
-  if (in_total_size != 0) {
-      in_task_size = in_total_size / in_data_size;
-      if (in_total_size != in_task_size * in_data_size) {
+
+    if (in_total_size != 0)
+    {
+        in_task_size = in_total_size / in_data_size;
+        if (in_total_size != in_task_size * in_data_size) {
           printf("mismatch of in_total_size and in_data_size\n");
-    }
-  }
-
-  if (out_total_size != 0) {
-    out_task_size = out_total_size / out_data_size;
-    if (out_total_size != out_task_size * out_data_size) {
-      printf("mismatch of out_total_size and out_data_size\n");
+        }
     }
-  }
- 
-  /*in, out の大きい方に合わせるのがいいかな？ Taskの数は1Task分に使うデータの大きいほうを取るような仕様がいいかな*/
-  int task_num = (in_task_size > out_task_size) ? in_task_size : out_task_size;
-
-  if (task_num == 0) task_num = 1;
 
-  /*spe分あればいいのかな？*/
+    if (out_total_size != 0) {
+        out_task_size = out_total_size / out_data_size;
+        if (out_total_size != out_task_size * out_data_size) {
+            printf("mismatch of out_total_size and out_data_size\n");
+        }
+    }
+  /*in, out の大きい方に合わせるのがいいかな？ Taskの数は1Task分に使うデータの大きいほうを取るような仕様がいいかな*/
+    int task_num = (in_task_size > out_task_size) ? in_task_size : out_task_size;
 
-  int array_num = spe_num;
-  if (task_num < array_num) {
-    array_num = task_num;
-  }
+    if (task_num == 0) task_num = 1;
+
+    /*spe分あればいいのかな？*/
+
+    int array_num = spe_num;
+    if (task_num < array_num) {
+        array_num = task_num;
+    }
 
 
-  int array_length = task_num / array_num;
-  int rest = task_num % array_num;
-
-  HTaskPtr *task_array = (HTask**)manager->allocate(sizeof(HTask*)*array_num);
-  TaskPtr *t_exec = (Task**)manager->allocate(sizeof(Task*)*array_length*array_num);
-
-  int index = 0;
-  
-  for (int k = 0; k < array_num; k++) {
+    int array_length = task_num / array_num;
+    int rest = task_num % array_num;
 
-    task_array[k] = manager->create_task_array(command,array_length,0,1,1);
-    t_exec[k] = 0;
-    
-    if (wait_me != 0) {
-      wait_me->wait_for(task_array[k]);
-    }
-    if (wait_i != 0) {
-      task_array[k]->wait_for(wait_i);
-    }
-    
-  }
+    HTaskPtr *task_array = (HTask**)manager->allocate(sizeof(HTask*)*array_num);
+    TaskPtr *t_exec = (Task**)manager->allocate(sizeof(Task*)*array_length*array_num);
 
-  for (int j = 0; j < array_length; j++) {
+    int index = 0;
     for (int k = 0; k < array_num; k++) {
-      
-      t_exec[k] = task_array[k]->next_task_array(command,t_exec[k]);
-      t_exec[k]->set_inData(0,(char*)in_data + index*in_data_size, in_data_size);
-      t_exec[k]->set_outData(0,(char*)out_data + index*out_data_size, out_data_size);
-
-      index++;
-
-    }
-  }
-  
-  for (int k = 0; k < array_num; k++) {
-    task_array[k]->spawn_task_array(t_exec[k]->next());
-    task_array[k]->set_cpu(SPE_ANY);
-    task_array[k]->spawn();
-  }	
-
-  for (int k = 0; k < rest; k++) {
-    HTaskPtr t_exec = manager->create_task(command);
-    
-    t_exec->set_inData(0,(char*)in_data + index*in_data_size, in_data_size);
-    t_exec->set_outData(0,(char*)out_data + index*out_data_size, out_data_size);
-      
-    index++;
-
-    if (wait_me != 0) {
-      wait_me->wait_for(t_exec);
-    }
-    if (wait_i != 0) {
-      t_exec->wait_for(wait_i);
+        task_array[k] = manager->create_task_array(command,array_length,0,1,1);
+        t_exec[k] = 0;
+        if (wait_me != 0) {
+            wait_me->wait_for(task_array[k]);
+        }
+        if (wait_i != 0) {
+            task_array[k]->wait_for(wait_i);
+        }
     }
 
-    t_exec->set_cpu(SPE_ANY);
-    t_exec->spawn();
+    for (int j = 0; j < array_length; j++) {
+        for (int k = 0; k < array_num; k++) {
+            t_exec[k] = task_array[k]->next_task_array(command,t_exec[k]);
+            t_exec[k]->set_inData(0,(char*)in_data + index*in_data_size, in_data_size);
+            t_exec[k]->set_outData(0,(char*)out_data + index*out_data_size, out_data_size);
+
+            index++;
+        }
+    }
 
-  }
+    for (int k = 0; k < array_num; k++) {
+        task_array[k]->spawn_task_array(t_exec[k]->next());
+        task_array[k]->set_cpu(SPE_ANY);
+        task_array[k]->spawn();
+    }
+
+    for (int k = 0; k < rest; k++) {
+        HTaskPtr t_exec = manager->create_task(command);
 
+        t_exec->set_inData(0,(char*)in_data + index*in_data_size, in_data_size);
+        t_exec->set_outData(0,(char*)out_data + index*out_data_size, out_data_size);
 
+        index++;
+
+        if (wait_me != 0) wait_me->wait_for(t_exec);
+        if (wait_i != 0) t_exec->wait_for(wait_i);
+
+        t_exec->set_cpu(SPE_ANY);
+        t_exec->spawn();
+    }
 }
 
 void
 hello_init(TaskManager *manager)
 {
-
     for (int i = 0; i < count; i++) {
         /**
          * Create Task
-         *   create_task(Task ID);
+         * create_task(Task ID);
          */
-        
-        
         if (use_task_creater) {
-            
-            simple_task_creater(0,0,Hello,0,0,0,0,manager,0,0);	
-    
+            simple_task_creater(0,0,HELLO_TASK,0,0,0,0,manager,0,0);
         } else {
-
-	HTask *hello = manager->create_task(Hello);
+            HTask *hello = manager->create_task(HELLO_TASK);
+            /**
+             * Select CPU
+             *   SPE_0, SPE_1, SPE_2, SPE_3, SPE_4, SPE_5, SPE_ANY
+             *   if you do not call this, execute PPE.
+             */
+            hello->set_cpu(SPE_ANY);
 
-	/**
-	 * Select CPU
-	 *   SPE_0, SPE_1, SPE_2, SPE_3, SPE_4, SPE_5, SPE_ANY
-	 *   if you do not call this, execute PPE.
-	 */
-	hello->set_cpu(SPE_ANY);
+            /**
+             * Set 32bits parameter
+             *   add_param(32bit parameter);
+             */
+            hello->set_param(0,(memaddr)i);
 
-	/**
-	 * Set 32bits parameter
-	 *   add_param(32bit parameter);
-	 */
-	hello->set_param(0,(memaddr)i);
-
-	hello->spawn();
-      }
+            hello->spawn();
+        }
     }
-
-
 }
 
 int
 TMmain(TaskManager *manager, int argc, char *argv[])
 {
     if (init(argc, argv) < 0) {
-	return -1;
+        return -1;
     }
 
     // Task Register
-    //   ppe/task_init.cc
+    // ppe/task_init.cc
     task_init();
-
     hello_init(manager);
-
     return 0;
 }
--- a/example/HelloWorld/ppe/task_init.cc	Sun Aug 10 18:44:47 2014 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#include "Func.h"
-#include "Scheduler.h"
-
-/* 必ずこの位置に書いて */
-SchedExternTask(Hello);
-
-/**
- * この関数は ../spe/spe-main と違って
- * 自分で呼び出せばいい関数なので
- * 好きな関数名でおk (SchedRegisterTask は必須)
- */
-
-void
-task_init()
-{
-  SchedRegister(Hello);
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/example/HelloWorld/task_init.cc	Tue Sep 02 16:39:06 2014 +0900
@@ -0,0 +1,17 @@
+#include "Func.h"
+#include "Scheduler.h"
+
+/* 必ずこの位置に書いて */
+SchedExternTask(Hello);
+
+/**
+ * この関数は ../spe/spe-main と違って
+ * 自分で呼び出せばいい関数なので
+ * 好きな関数名でおk (SchedRegisterTask は必須)
+ */
+
+void
+task_init()
+{
+  SchedRegisterTask(HELLO_TASK,Hello);
+}