Changeset 8fdb18e in mainline

Timestamp:

2013-05-03T14:51:30Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5d1cb8a

Parents:

ef904895 (diff), 1c7ba2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace

Files:

• app/dnsres/dnsres.c (modified) (3 diffs)
• app/inet/inet.c (modified) (9 diffs)
• app/ping/ping.c (modified) (6 diffs)
• app/vlaunch/vlaunch.c (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/inet/addr.c (added)
• lib/c/include/inet/addr.h (added)
• lib/c/include/inet/inet.h (modified) (1 diff)
• lib/c/include/inet/inetcfg.h (modified) (1 diff)
• lib/gui/window.c (modified) (1 diff)
• srv/hid/compositor/compositor.c (modified) (16 diffs)
• srv/net/inetsrv/inetsrv.h (modified) (2 diffs)

uspace/app/dnsres/dnsres.c

@@ -34 +34 @@
 
 #include <errno.h>
+#include <inet/addr.h>
 #include <inet/dnsr.h>
 #include <stdio.h>
@@ -43 +44 @@
 {
         printf("syntax: " NAME " <host-name>\n");
-}
-
-static int addr_format(inet_addr_t *addr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d", addr->ipv4 >> 24,
-            (addr->ipv4 >> 16) & 0xff, (addr->ipv4 >> 8) & 0xff,
-            addr->ipv4 & 0xff);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
 }
 
@@ -76 +63 @@
         }
 
-        rc = addr_format(&hinfo->addr, &saddr);
+        rc = inet_addr_format(&hinfo->addr, &saddr);
         if (rc != EOK) {
                 dnsr_hostinfo_destroy(hinfo);

uspace/app/inet/inet.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 
 #include <errno.h>
+#include <inet/addr.h>
 #include <inet/inetcfg.h>
 #include <loc.h>
@@ -54 +55 @@
 }
 
-static int naddr_parse(const char *text, inet_naddr_t *naddr)
-{
-        unsigned long a[4], bits;
-        char *cp = (char *)text;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                a[i] = strtoul(cp, &cp, 10);
-                if (*cp != '.')
-                        return EINVAL;
-                ++cp;
-        }
-
-        a[3] = strtoul(cp, &cp, 10);
-        if (*cp != '/')
-                return EINVAL;
-        ++cp;
-
-        bits = strtoul(cp, &cp, 10);
-        if (*cp != '\0')
-                return EINVAL;
-
-        naddr->ipv4 = 0;
-        for (i = 0; i < 4; i++) {
-                if (a[i] > 255)
-                        return EINVAL;
-                naddr->ipv4 = (naddr->ipv4 << 8) | a[i];
-        }
-
-        if (bits > 31)
-                return EINVAL;
-
-        naddr->bits = bits;
-        return EOK;
-}
-
-static int addr_parse(const char *text, inet_addr_t *addr)
-{
-        unsigned long a[4];
-        char *cp = (char *)text;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                a[i] = strtoul(cp, &cp, 10);
-                if (*cp != '.')
-                        return EINVAL;
-                ++cp;
-        }
-
-        a[3] = strtoul(cp, &cp, 10);
-        if (*cp != '\0')
-                return EINVAL;
-
-        addr->ipv4 = 0;
-        for (i = 0; i < 4; i++) {
-                if (a[i] > 255)
-                        return EINVAL;
-                addr->ipv4 = (addr->ipv4 << 8) | a[i];
-        }
-
-        return EOK;
-}
-
-static int naddr_format(inet_naddr_t *naddr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d/%d", naddr->ipv4 >> 24,
-            (naddr->ipv4 >> 16) & 0xff, (naddr->ipv4 >> 8) & 0xff,
-            naddr->ipv4 & 0xff, naddr->bits);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
-}
-
-static int addr_format(inet_addr_t *addr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d", addr->ipv4 >> 24,
-            (addr->ipv4 >> 16) & 0xff, (addr->ipv4 >> 8) & 0xff,
-            addr->ipv4 & 0xff);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
-}
-
 static int addr_create_static(int argc, char *argv[])
 {
@@ -178 +88 @@
         }
 
-        rc = naddr_parse(addr_spec, &naddr);
+        rc = inet_naddr_parse(addr_spec, &naddr);
         if (rc != EOK) {
                 printf(NAME ": Invalid network address format '%s'.\n",
@@ -267 +177 @@
         route_name = argv[2];
 
-        rc = naddr_parse(dest_str, &dest);
+        rc = inet_naddr_parse(dest_str, &dest);
         if (rc != EOK) {
                 printf(NAME ": Invalid network address format '%s'.\n",
@@ -274 +184 @@
         }
 
-        rc = addr_parse(router_str, &router);
+        rc = inet_addr_parse(router_str, &router);
         if (rc != EOK) {
                 printf(NAME ": Invalid address format '%s'.\n", router_str);
@@ -366 +276 @@
                 }
 
-                rc = naddr_format(&ainfo.naddr, &astr);
+                rc = inet_naddr_format(&ainfo.naddr, &astr);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -430 +340 @@
                 }
 
-                rc = naddr_format(&srinfo.dest, &dest_str);
+                rc = inet_naddr_format(&srinfo.dest, &dest_str);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");
@@ -437 +347 @@
                 }
 
-                rc = addr_format(&srinfo.router, &router_str);
+                rc = inet_addr_format(&srinfo.router, &router_str);
                 if (rc != EOK) {
                         printf("Memory allocation failed.\n");

uspace/app/ping/ping.c

@@ -38 +38 @@
 #include <fibril_synch.h>
 #include <inet/dnsr.h>
+#include <inet/addr.h>
 #include <inet/inetping.h>
 #include <io/console.h>
@@ -72 +73 @@
 }
 
-static int addr_parse(const char *text, inet_addr_t *addr)
-{
-        unsigned long a[4];
-        char *cp = (char *)text;
-        int i;
-
-        for (i = 0; i < 3; i++) {
-                a[i] = strtoul(cp, &cp, 10);
-                if (*cp != '.')
-                        return EINVAL;
-                ++cp;
-        }
-
-        a[3] = strtoul(cp, &cp, 10);
-        if (*cp != '\0')
-                return EINVAL;
-
-        addr->ipv4 = 0;
-        for (i = 0; i < 4; i++) {
-                if (a[i] > 255)
-                        return EINVAL;
-                addr->ipv4 = (addr->ipv4 << 8) | a[i];
-        }
-
-        return EOK;
-}
-
-static int addr_format(inet_addr_t *addr, char **bufp)
-{
-        int rc;
-
-        rc = asprintf(bufp, "%d.%d.%d.%d", addr->ipv4 >> 24,
-            (addr->ipv4 >> 16) & 0xff, (addr->ipv4 >> 8) & 0xff,
-            addr->ipv4 & 0xff);
-
-        if (rc < 0)
-                return ENOMEM;
-
-        return EOK;
-}
-
 static void ping_signal_done(void)
 {
@@ -126 +86 @@
         int rc;
 
-        rc = addr_format(&sdu->src, &asrc);
+        rc = inet_addr_format(&sdu->src, &asrc);
         if (rc != EOK)
                 return ENOMEM;
 
-        rc = addr_format(&sdu->dest, &adest);
+        rc = inet_addr_format(&sdu->dest, &adest);
         if (rc != EOK) {
                 free(asrc);
@@ -242 +202 @@
 
         /* Parse destination address */
-        rc = addr_parse(argv[argi], &dest_addr);
+        rc = inet_addr_parse(argv[argi], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
@@ -261 +221 @@
         }
 
-        rc = addr_format(&src_addr, &asrc);
+        rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
                 printf(NAME ": Out of memory.\n");
@@ -267 +227 @@
         }
 
-        rc = addr_format(&dest_addr, &adest);
+        rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
                 printf(NAME ": Out of memory.\n");

uspace/app/vlaunch/vlaunch.c

@@ -121 +121 @@
         }
         
-        pixel_t grd_bg = PIXEL(255, 240, 240, 240);
+        pixel_t grd_bg = PIXEL(255, 255, 255, 255);
         pixel_t btn_bg = PIXEL(255, 0, 0, 0);
         pixel_t btn_fg = PIXEL(255, 240, 240, 240);
-        pixel_t lbl_bg = PIXEL(255, 240, 240, 240);
+        pixel_t lbl_bg = PIXEL(255, 255, 255, 255);
         pixel_t lbl_fg = PIXEL(255, 0, 0, 0);
         

uspace/lib/c/Makefile

@@ -92 +92 @@
         generic/task.c \
         generic/futex.c \
+        generic/inet/addr.c \
         generic/inet.c \
         generic/inetcfg.c \

uspace/lib/c/include/inet/inet.h

@@ -36 +36 @@
 #define LIBC_INET_INET_H_
 
+#include <inet/addr.h>
 #include <sys/types.h>
 
 #define INET_TTL_MAX 255
-
-typedef struct {
-        uint32_t ipv4;
-} inet_addr_t;
 
 typedef struct {

uspace/lib/c/include/inet/inetcfg.h

@@ -38 +38 @@
 #include <inet/inet.h>
 #include <sys/types.h>
-
-/** Network address */
-typedef struct {
-        /** Address */
-        uint32_t ipv4;
-        /** Number of valid bits in @c ipv4 */
-        int bits;
-} inet_naddr_t;
 
 /** Address object info */

uspace/lib/gui/window.c

@@ -424 +424 @@
 
         while (!list_empty(&win->events.list)) {
-                list_remove(list_first(&win->events.list));
+                window_event_t *event = (window_event_t *) list_first(&win->events.list);
+                list_remove(&event->link);
+                free(event);
         }
 

uspace/srv/hid/compositor/compositor.c

@@ -90 +90 @@
 typedef struct {
         link_t link;
+        atomic_t ref_cnt;
         service_id_t in_dsid;
         service_id_t out_dsid;
@@ -138 +139 @@
 } viewport_t;
 
+static desktop_rect_t viewport_bound_rect;
 static FIBRIL_MUTEX_INITIALIZE(viewport_list_mtx);
 static LIST_INITIALIZE(viewport_list);
@@ -215 +217 @@
 
         link_initialize(&win->link);
+        atomic_set(&win->ref_cnt, 0);
         prodcons_initialize(&win->queue);
         transform_identity(&win->transform);
@@ -232 +235 @@
 static void window_destroy(window_t *win)
 {
-        if (win) {
+        if (win && atomic_get(&win->ref_cnt) == 0) {
+                while (!list_empty(&win->queue.list)) {
+                        window_event_t *event = (window_event_t *) list_first(&win->queue.list);
+                        list_remove(&event->link);
+                        free(event);
+                }
+
                 if (win->surface) {
                         surface_destroy(win->surface);
@@ -310 +319 @@
 }
 
+static void comp_restrict_pointers(void)
+{
+        fibril_mutex_lock(&viewport_list_mtx);
+
+        sysarg_t x_res = coord_origin;
+        sysarg_t y_res = coord_origin;
+        sysarg_t w_res = 0;
+        sysarg_t h_res = 0;
+
+        if (!list_empty(&viewport_list)) {
+                viewport_t *vp = (viewport_t *) list_first(&viewport_list);
+                x_res = vp->pos.x;
+                y_res = vp->pos.y;
+                surface_get_resolution(vp->surface, &w_res, &h_res);
+        }
+
+        list_foreach(viewport_list, link) {
+                viewport_t *vp = list_get_instance(link, viewport_t, link);
+                sysarg_t w_vp, h_vp;
+                surface_get_resolution(vp->surface, &w_vp, &h_vp);
+                rectangle_union(
+                    x_res, y_res, w_res, h_res,
+                    vp->pos.x, vp->pos.y, w_vp, h_vp,
+                    &x_res, &y_res, &w_res, &h_res);
+        }
+
+        viewport_bound_rect.x = x_res;
+        viewport_bound_rect.y = y_res;
+        viewport_bound_rect.w = w_res;
+        viewport_bound_rect.h = h_res;
+
+        fibril_mutex_unlock(&viewport_list_mtx);
+
+        fibril_mutex_lock(&pointer_list_mtx);
+
+        list_foreach(pointer_list, link) {
+                pointer_t *ptr = list_get_instance(link, pointer_t, link);
+                ptr->pos.x = ptr->pos.x > viewport_bound_rect.x ? ptr->pos.x : viewport_bound_rect.x;
+                ptr->pos.y = ptr->pos.y > viewport_bound_rect.y ? ptr->pos.y : viewport_bound_rect.y;
+                ptr->pos.x = ptr->pos.x < viewport_bound_rect.x + viewport_bound_rect.w ?
+                    ptr->pos.x : viewport_bound_rect.x + viewport_bound_rect.w;
+                ptr->pos.y = ptr->pos.y < viewport_bound_rect.y + viewport_bound_rect.h ?
+                    ptr->pos.y : viewport_bound_rect.y + viewport_bound_rect.h;
+        }
+
+        fibril_mutex_unlock(&pointer_list_mtx);
+}
+
 static void comp_damage(sysarg_t x_dmg_glob, sysarg_t y_dmg_glob,
     sysarg_t w_dmg_glob, sysarg_t h_dmg_glob)
@@ -695 +752 @@
         }
 
+        loc_service_unregister(win->in_dsid);
+        loc_service_unregister(win->out_dsid);
+
+        /* In case the client was killed, input fibril of the window might be
+         * still blocked on the condition within comp_window_get_event. */
+        window_event_t *event_dummy = (window_event_t *) malloc(sizeof(window_event_t));
+        if (event_dummy) {
+                link_initialize(&event_dummy->link);
+                prodcons_produce(&win->queue, &event_dummy->link);
+        }
+
         /* Calculate damage. */
         sysarg_t x = 0;
@@ -706 +774 @@
         }
 
-        /* Release window resources. */
-        loc_service_unregister(win->in_dsid);
-        loc_service_unregister(win->out_dsid);
-        while (!list_empty(&win->queue.list)) {
-                list_remove(list_first(&win->queue.list));
-        }
-        window_destroy(win);
-
         comp_damage(x, y, width, height);
 
@@ -813 +873 @@
 
         if (win) {
+                atomic_inc(&win->ref_cnt);
                 async_answer_0(iid, EOK);
         } else {
@@ -825 +886 @@
 
                         if (!IPC_GET_IMETHOD(call)) {
-                                async_answer_0(callid, EINVAL);
+                                async_answer_0(callid, EOK);
+                                atomic_dec(&win->ref_cnt);
+                                window_destroy(win);
                                 return;
                         }
@@ -842 +905 @@
 
                         if (!IPC_GET_IMETHOD(call)) {
-                                async_answer_0(callid, EINVAL);
+                                comp_window_close(win, callid, &call);
+                                atomic_dec(&win->ref_cnt);
+                                window_destroy(win);
                                 return;
                         }
@@ -857 +922 @@
                                 break;
                         case WINDOW_CLOSE:
-                                comp_window_close(win, callid, &call);
+                                /* Postpone the closing until the phone is hung up to cover
+                                 * the case when the client is killed abruptly. */
+                                async_answer_0(callid, EOK);
                                 break;
                         case WINDOW_CLOSE_REQUEST:
@@ -911 +978 @@
         async_answer_0(iid, EOK);
 
+        comp_restrict_pointers();
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
 }
@@ -956 +1024 @@
                 fibril_mutex_unlock(&viewport_list_mtx);
                 async_answer_0(iid, EOK);
+
+                comp_restrict_pointers();
+                comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         }
 }
@@ -1391 +1462 @@
         surface_get_resolution(pointer->cursor.states[pointer->state], 
              &cursor_width, &cursor_height);
+        if (pointer->pos.x + dx < viewport_bound_rect.x) {
+                dx = -1 * (pointer->pos.x - viewport_bound_rect.x);
+        }
+        if (pointer->pos.y + dy < viewport_bound_rect.y) {
+                dy = -1 * (pointer->pos.y - viewport_bound_rect.y);
+        }
+        if (pointer->pos.x + dx > viewport_bound_rect.x + viewport_bound_rect.w) {
+                dx = (viewport_bound_rect.x + viewport_bound_rect.w - pointer->pos.x);
+        }
+        if (pointer->pos.y + dy > viewport_bound_rect.y + viewport_bound_rect.h) {
+                dy = (viewport_bound_rect.y + viewport_bound_rect.h - pointer->pos.y);
+        }
         pointer->pos.x += dx;
         pointer->pos.y += dy;
@@ -1910 +1993 @@
                         fibril_mutex_unlock(&viewport_list_mtx);
 
+                        comp_restrict_pointers();
                         comp_damage(x, y, width, height);
                 } else {
@@ -2122 +2206 @@
                 return -1;
         }
-        
+
+        comp_restrict_pointers();
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         

uspace/srv/net/inetsrv/inetsrv.h

@@ -40 +40 @@
 #include <adt/list.h>
 #include <stdbool.h>
+#include <inet/addr.h>
 #include <inet/iplink.h>
 #include <ipc/loc.h>
@@ -61 +62 @@
         link_t client_list;
 } inetping_client_t;
-
-/** Host address */
-typedef struct {
-        uint32_t ipv4;
-} inet_addr_t;
-
-/** Network address */
-typedef struct {
-        /** Address */
-        uint32_t ipv4;
-        /** Number of valid bits in @c ipv4 */
-        int bits;
-} inet_naddr_t;
 
 /** Address object info */