Changeset 16990

Timestamp:

07/06/12 03:59:43 (11 years ago)

Author:

nit

Message:

[titan] add new sortmethode for timer

File:

• titan/titan/rectimer.h (modified) (6 diffs)

titan/titan/rectimer.h

@@ -11 +11 @@
                 node = node->next;
         }
+}
+
+void sortrectimer()
+{
+        struct rectimer *nodea = NULL, *nodeb = NULL, *nodec = NULL, *noded = NULL;
+        struct rectimer *nodetmp = NULL, *node = rectimer;
+
+        if(node != NULL)
+        {
+                while (noded != node->next)
+                {
+                        nodec = node;
+                        nodea = node;
+                        nodeb = nodea->next;
+
+                        while (nodea != noded)
+                        {
+                                if (nodea->begin >= nodeb->begin)
+                                {
+                                        if (nodea == node)
+                                        {
+                                                nodetmp = nodeb->next;
+                                                nodeb->next = nodea;
+                                                nodea->next = nodetmp;
+                                                node = nodeb;
+                                                nodec = nodeb;
+                                        }
+                                        else
+                                        {
+                                                nodetmp = nodeb->next;
+                                                nodeb->next = nodea;
+                                                nodea->next = nodetmp;
+                                                nodec->next = nodeb;
+                                                nodec = nodeb;
+                                        }
+                                }
+                                else
+                                {
+                                        nodec = nodea;
+                                        nodea = nodea->next;
+                                }
+                                nodeb = nodea->next;
+                                if (nodeb == noded)
+                                        noded = nodea;
+                        }
+                }
+        }
+
+        struct rectimer* prev = NULL;
+        nodetmp = node;
+        while(nodetmp != NULL)
+        {
+                nodetmp->prev = prev;
+                prev = nodetmp;
+
+                nodetmp = nodetmp->next;
+        }
+
+        rectimer = node;
 }
 
@@ -71 +130 @@
 
         if(node->repeate == 0) return;
+        status.writerectimer = 1;
 
         //get rectimer start day
@@ -489 +549 @@
 
         if(flag == 0) m_lock(&status.rectimermutex, 1);
-  struct rectimer *node = rectimer, *prev = rectimer;
+        struct rectimer *node = rectimer, *prev = rectimer;
 
         while(node != NULL)
@@ -602 +662 @@
 
         if(flag == 0) m_lock(&status.rectimermutex, 1);
+        sortrectimer();
   node = rectimer;
 
@@ -1264 +1325 @@
                         }
 
+                        tmpstr = ostrcat(tmpstr, "\n", 1, 0);
                         if(rectimernode->name != NULL)
                         {
-                                tmpstr = ostrcat(tmpstr, "\n", 1, 0);
                                 if(rectimernode->name == NULL || strlen(rectimernode->name) == 0)
                                         tmpstr = ostrcat(tmpstr, "---", 1, 0);
@@ -1280 +1341 @@
                         }
 
+                        tmpstr = ostrcat(tmpstr, "\n", 1, 0);
                         if(rectimernode->status == 0)
-                        {
-                                tmpstr = ostrcat(tmpstr, "\n", 1, 0);
                                 tmpstr = ostrcat(tmpstr, _("waiting"), 1, 0);
-                        }
                         else if(rectimernode->status == 1)
-                        {
-                                tmpstr = ostrcat(tmpstr, "\n", 1, 0);
                                 tmpstr = ostrcat(tmpstr, _("running"), 1, 0);
-                        }
                         else if(rectimernode->status == 2)
-                        {
-                                tmpstr = ostrcat(tmpstr, "\n", 1, 0);
                                 tmpstr = ostrcat(tmpstr, _("success"), 1, 0);
-                        }
                         else if(rectimernode->status == 3)
-                        {
-                                tmpstr = ostrcat(tmpstr, "\n", 1, 0);
                                 tmpstr = ostrcat(tmpstr, _("error"), 1, 0);
-                        }
 
                         if(flag == 1 && rectimernode->errstr != NULL && strlen(rectimernode->errstr) != 0)