g15daemon-commits

[G15daemon-commits] SF.net SVN: g15daemon: [321] trunk/g15daemon-wip/g15daemon/linked_lists.c

[<mla...@us...>]

Revision: 321
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=321&view=rev
Author:   mlampard
Date:     2007-11-28 16:00:29 -0800 (Wed, 28 Nov 2007)

Log Message:
-----------
minor optimisation of lcd_cycle()

Modified Paths:
--------------
    trunk/g15daemon-wip/g15daemon/linked_lists.c

Modified: trunk/g15daemon-wip/g15daemon/linked_lists.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/linked_lists.c	2007-11-23 04:19:00 UTC (rev 320)
+++ trunk/g15daemon-wip/g15daemon/linked_lists.c	2007-11-29 00:00:29 UTC (rev 321)
@@ -119,6 +119,7 @@
     lcdnode_t *current_screen = masterlist->current;
     
     g15daemon_send_event(current_screen->lcd, G15_EVENT_VISIBILITY_CHANGED, SCR_HIDDEN);
+      
     do
     {
         pthread_mutex_lock(&lcdlist_mutex);
@@ -132,19 +133,18 @@
         pthread_mutex_unlock(&lcdlist_mutex);
     } 
     while (current_screen != masterlist->current);
+
     pthread_mutex_lock(&lcdlist_mutex);
     if(masterlist->tail == masterlist->current) {
         masterlist->current = masterlist->head;
     } else {
         masterlist->current = masterlist->current->prev;
     }
+    masterlist->current->last_priority =  masterlist->current;
     pthread_mutex_unlock(&lcdlist_mutex);
+    g15daemon_send_event(current_screen->lcd, G15_EVENT_USER_FOREGROUND, 1);
     g15daemon_send_event(masterlist->current->lcd, G15_EVENT_VISIBILITY_CHANGED, SCR_VISIBLE);
-    g15daemon_send_event(current_screen->lcd, G15_EVENT_USER_FOREGROUND, 1);
-    pthread_mutex_lock(&lcdlist_mutex);
-    masterlist->current->lcd->state_changed = 1;
-    masterlist->current->last_priority =  masterlist->current;
-    pthread_mutex_unlock(&lcdlist_mutex);
+
 }
 
 void g15daemon_lcdnode_remove (lcdnode_t *oldnode) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [412] trunk/g15daemon-wip/g15daemon/linked_lists.c

[<mla...@us...>]

Revision: 412
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=412&view=rev
Author:   mlampard
Date:     2008-01-14 18:00:15 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
fix potential deadlock in lcd_cycle()

Modified Paths:
--------------
    trunk/g15daemon-wip/g15daemon/linked_lists.c

Modified: trunk/g15daemon-wip/g15daemon/linked_lists.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/linked_lists.c	2008-01-13 03:01:07 UTC (rev 411)
+++ trunk/g15daemon-wip/g15daemon/linked_lists.c	2008-01-15 02:00:15 UTC (rev 412)
@@ -117,14 +117,13 @@
 void g15daemon_lcdnode_cycle(g15daemon_t *masterlist)
 {
     lcdnode_t *current_screen = NULL;
+    pthread_mutex_lock(&lcdlist_mutex);
 skip:
     current_screen = masterlist->current;
     
     g15daemon_send_event(current_screen->lcd, G15_EVENT_VISIBILITY_CHANGED, SCR_HIDDEN);
-      
     do
     {
-        pthread_mutex_lock(&lcdlist_mutex);
         g15daemon_send_event(current_screen->lcd, G15_EVENT_USER_FOREGROUND, 0);
         
         if(masterlist->tail == masterlist->current){
@@ -132,11 +131,9 @@
         }else{
             masterlist->current = masterlist->current->prev;
         }
-        pthread_mutex_unlock(&lcdlist_mutex);
     } 
     while (current_screen != masterlist->current);
 
-    pthread_mutex_lock(&lcdlist_mutex);
     if(masterlist->tail == masterlist->current) {
         masterlist->current = masterlist->head;
     } else {
@@ -144,12 +141,12 @@
     }
 
     if(masterlist->current->lcd->never_select==1) {
-       pthread_mutex_unlock(&lcdlist_mutex);
        goto skip;
     }
 
     masterlist->current->last_priority =  masterlist->current;
     pthread_mutex_unlock(&lcdlist_mutex);
+
     g15daemon_send_event(current_screen->lcd, G15_EVENT_USER_FOREGROUND, 1);
     g15daemon_send_event(masterlist->current->lcd, G15_EVENT_VISIBILITY_CHANGED, SCR_VISIBLE);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [442] trunk/g15daemon-wip/g15daemon/linked_lists.c

[<mla...@us...>]

Revision: 442
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=442&view=rev
Author:   mlampard
Date:     2008-01-22 02:30:52 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: ensure lcd is updated on client removal.

Modified Paths:
--------------
    trunk/g15daemon-wip/g15daemon/linked_lists.c

Modified: trunk/g15daemon-wip/g15daemon/linked_lists.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/linked_lists.c	2008-01-22 10:09:21 UTC (rev 441)
+++ trunk/g15daemon-wip/g15daemon/linked_lists.c	2008-01-22 10:30:52 UTC (rev 442)
@@ -188,6 +188,7 @@
         (*prev)->next = (*masterlist)->tail;
         (*masterlist)->head = oldnode->prev;
     }
+    g15daemon_send_refresh((*masterlist)->current->lcd);
 
     free(oldnode);
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.