Changeset 87b52c9 in mainline for uspace/srv

Timestamp:

2011-04-01T11:34:41Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

66a54cc

Parents:

df3ad97 (diff), 27bdfa5 (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 from usb/development

Location:

uspace/srv

Files:

• devman/devman.c (modified) (3 diffs)
• devman/main.c (modified) (1 diff)
• devman/util.c (modified) (1 diff)
• devman/util.h (modified) (1 diff)
• hid/kbd/Makefile (modified) (1 diff)
• hid/kbd/ctl/pl050.c (deleted)
• hid/kbd/generic/kbd.c (modified) (2 diffs)
• hid/kbd/include/kbd.h (modified) (1 diff)
• hid/kbd/port/ns16550.c (modified) (1 diff)
• hid/kbd/port/z8530.c (modified) (1 diff)
• hw/bus/cuda_adb/cuda_adb.c (modified) (2 diffs)
• hw/irc/apic/apic.c (modified) (4 diffs)
• hw/irc/fhc/fhc.c (modified) (1 diff)
• hw/irc/i8259/i8259.c (modified) (1 diff)
• hw/irc/obio/obio.c (modified) (1 diff)
• hw/netif/ne2000/dp8390.c (modified) (1 diff)
• hw/netif/ne2000/ne2000.c (modified) (2 diffs)
• loader/arch/abs32le/_link.ld.in (modified) (1 diff)
• loader/arch/amd64/_link.ld.in (modified) (1 diff)
• loader/arch/arm32/_link.ld.in (modified) (1 diff)
• loader/arch/ia32/_link.ld.in (modified) (1 diff)
• loader/arch/ia64/_link.ld.in (modified) (2 diffs)
• loader/arch/mips32/_link.ld.in (modified) (1 diff)
• loader/arch/ppc32/_link.ld.in (modified) (1 diff)
• loader/arch/sparc64/_link.ld.in (modified) (1 diff)
• loader/main.c (modified) (1 diff)
• net/il/arp/arp.c (modified) (13 diffs)
• net/il/ip/ip.c (modified) (1 diff)
• net/net/net.c (modified) (6 diffs)
• net/nil/eth/eth.c (modified) (1 diff)
• net/tl/tcp/tcp.c (modified) (2 diffs)
• net/tl/udp/udp.c (modified) (2 diffs)
• vfs/vfs_ops.c (modified) (6 diffs)

uspace/srv/devman/devman.c

@@ -274 +274 @@
         }
         
-        if (read(fd, buf, len) <= 0) {
+        ssize_t read_bytes = safe_read(fd, buf, len);
+        if (read_bytes <= 0) {
                 printf(NAME ": unable to read file '%s'.\n", conf_path);
                 goto cleanup;
         }
-        buf[len] = 0;
+        buf[read_bytes] = 0;
         
         suc = parse_match_ids(buf, ids);
@@ -1131 +1132 @@
 fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path)
 {
+        assert(path != NULL);
+
+        bool is_absolute = path[0] == '/';
+        if (!is_absolute) {
+                return NULL;
+        }
+
         fibril_rwlock_read_lock(&tree->rwlock);
         
@@ -1140 +1148 @@
         char *rel_path = path;
         char *next_path_elem = NULL;
-        bool cont = (rel_path[0] == '/');
+        bool cont = true;
         
         while (cont && fun != NULL) {

uspace/srv/devman/main.c

@@ -477 +477 @@
                 dev = fun->dev;
 
-        if (fun == NULL && dev == NULL) {
+        /*
+         * For a valid function to connect to we need a device. The root
+         * function, for example, has no device and cannot be connected to.
+         * This means @c dev needs to be valid regardless whether we are
+         * connecting to a device or to a function.
+         */
+        if (dev == NULL) {
                 printf(NAME ": devman_forward error - no device or function with "
                     "handle %" PRIun " was found.\n", handle);

uspace/srv/devman/util.c

@@ -111 +111 @@
 }
 
+ssize_t safe_read(int fd, void *buffer, size_t size)
+{
+        if (size == 0) {
+                return 0;
+        }
+
+        uint8_t *buf_ptr = (uint8_t *) buffer;
+
+        size_t total_read = 0;
+        while (total_read < size) {
+                ssize_t bytes_read = read(fd, buf_ptr, size - total_read);
+                if (bytes_read < 0) {
+                        /* Error. */
+                        return bytes_read;
+                } else if (bytes_read == 0) {
+                        /* Possibly end of file. */
+                        break;
+                } else {
+                        /* Read at least something. */
+                        buf_ptr += bytes_read;
+                        total_read += bytes_read;
+                }
+        }
+
+        return (ssize_t) total_read;
+}
+
 /** @}
  */

uspace/srv/devman/util.h

@@ -47 +47 @@
 extern void replace_char(char *, char, char);
 
+extern ssize_t safe_read(int, void *, size_t);
+
 #endif
 

uspace/srv/hid/kbd/Makefile

@@ -78 +78 @@
                 SOURCES += \
                         port/pl050.c \
-                        ctl/pl050.c
+                        ctl/pc.c
         endif
 endif

uspace/srv/hid/kbd/generic/kbd.c

@@ -67 +67 @@
 static unsigned lock_keys;
 
-int cir_service = 0;
-int cir_phone = -1;
+bool irc_service = false;
+int irc_phone = -1;
 
 #define NUM_LAYOUTS 3
@@ -216 +216 @@
         sysarg_t obio;
         
-        if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
-                cir_service = SERVICE_FHC;
-        else if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
-                cir_service = SERVICE_OBIO;
-        
-        if (cir_service) {
-                while (cir_phone < 0)
-                        cir_phone = service_connect_blocking(cir_service, 0, 0);
+        if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
+            || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)))
+                irc_service = true;
+        
+        if (irc_service) {
+                while (irc_phone < 0)
+                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
         }
         

uspace/srv/hid/kbd/include/kbd.h

@@ -38 +38 @@
 #define KBD_KBD_H_
 
-extern int cir_service;
-extern int cir_phone;
+#include <bool.h>
+
+extern bool irc_service;
+extern int irc_phone;
 
 extern void kbd_push_scancode(int);

uspace/srv/hid/kbd/port/ns16550.c

@@ -120 +120 @@
         kbd_push_scancode(scan_code);
         
-        if (cir_service)
-                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
+        if (irc_service)
+                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }

uspace/srv/hid/kbd/port/z8530.c

@@ -108 +108 @@
         kbd_push_scancode(scan_code);
         
-        if (cir_service)
-                async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT,
+        if (irc_service)
+                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
                     IPC_GET_IMETHOD(*call));
 }

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -367 +367 @@
 static void cuda_irq_rcv_end(void *buf, size_t *len)
 {
-        uint8_t data, b;
-
+        uint8_t b;
+        
         b = pio_read_8(&dev->b);
-        data = pio_read_8(&dev->sr);
-
+        pio_read_8(&dev->sr);
+        
         if ((b & TREQ) == 0) {
                 instance->xstate = cx_receive;
@@ -379 +379 @@
                 cuda_send_start();
         }
-
-        memcpy(buf, instance->rcv_buf, instance->bidx);
-        *len = instance->bidx;
+        
+        memcpy(buf, instance->rcv_buf, instance->bidx);
+        *len = instance->bidx;
         instance->bidx = 0;
 }

uspace/srv/hw/irc/apic/apic.c

@@ -54 +54 @@
 #define NAME  "apic"
 
-static bool apic_found = false;
-
 static int apic_enable_irq(sysarg_t irq)
 {
@@ -81 +79 @@
                 callid = async_get_call(&call);
                 
-                sysarg_t method = IPC_GET_IMETHOD(call);
-                if (method == IPC_M_PHONE_HUNGUP) {
-                        return;
-                }
-
-                if (!apic_found) {
-                        async_answer_0(callid, ENOTSUP);
-                        break;
-                }
-
-                switch (method) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IRC_ENABLE_INTERRUPT:
                         async_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call)));
@@ -109 +97 @@
  *
  */
-static void apic_init(void)
+static bool apic_init(void)
 {
         sysarg_t apic;
         
-        apic_found = sysinfo_get_value("apic", &apic) && apic;
-        if (!apic_found) {
-                printf(NAME ": Warning: no APIC found\n");
+        if ((sysinfo_get_value("apic", &apic) != EOK) || (!apic)) {
+                printf(NAME ": No APIC found\n");
+                return false;
         }
         
         async_set_client_connection(apic_connection);
-        service_register(SERVICE_APIC);
+        service_register(SERVICE_IRC);
+        
+        return true;
 }
 
@@ -126 +116 @@
         printf(NAME ": HelenOS APIC driver\n");
         
-        apic_init();
-
+        if (!apic_init())
+                return -1;
+        
         printf(NAME ": Accepting connections\n");
         async_manager();

uspace/srv/hw/irc/fhc/fhc.c

@@ -136 +136 @@
         
         async_set_client_connection(fhc_connection);
-        service_register(SERVICE_FHC);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/irc/i8259/i8259.c

@@ -149 +149 @@
         
         async_set_client_connection(i8259_connection);
-        service_register(SERVICE_I8259);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/irc/obio/obio.c

@@ -137 +137 @@
         
         async_set_client_connection(obio_connection);
-        service_register(SERVICE_OBIO);
+        service_register(SERVICE_IRC);
         
         return true;

uspace/srv/hw/netif/ne2000/dp8390.c

@@ -391 +391 @@
         
         if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) {
+                fibril_mutex_unlock(&ne2k->sq_mutex);
                 fprintf(stderr, "%s: Frame dropped (invalid size %zu bytes)\n",
                     NAME, size);

uspace/srv/hw/netif/ne2000/ne2000.c

@@ -75 +75 @@
 #define IRQ_GET_TSR(call)  ((int) IPC_GET_ARG3(call))
 
-static int irc_service = 0;
+static bool irc_service = false;
 static int irc_phone = -1;
 
@@ -383 +383 @@
         sysarg_t i8259;
         
-        if ((sysinfo_get_value("apic", &apic) == EOK) && (apic))
-                irc_service = SERVICE_APIC;
-        else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))
-                irc_service = SERVICE_I8259;
+        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
+            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)))
+                irc_service = true;
         
         if (irc_service) {
                 while (irc_phone < 0)
-                        irc_phone = service_connect_blocking(irc_service, 0, 0);
+                        irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0);
         }
         

uspace/srv/loader/arch/abs32le/_link.ld.in

@@ -21 +21 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/amd64/_link.ld.in

@@ -27 +27 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/arm32/_link.ld.in

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/ia32/_link.ld.in

@@ -26 +26 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/ia64/_link.ld.in

@@ -21 +21 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         
@@ -29 +29 @@
         .got : {
                 _gp = .;
-                *(.got*);
+                *(.got .got.*);
         } :data
         

uspace/srv/loader/arch/mips32/_link.ld.in

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/ppc32/_link.ld.in

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/sparc64/_link.ld.in

@@ -20 +20 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/main.c

@@ -407 +407 @@
                         /* Not reached */
                 default:
-                        retval = ENOENT;
+                        retval = EINVAL;
                         break;
                 }
-                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) {
-                        DPRINTF("Responding EINVAL to method %d.\n",
-                            IPC_GET_IMETHOD(call));
-                        async_answer_0(callid, EINVAL);
-                }
+                
+                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP)
+                        async_answer_0(callid, retval);
         }
 }

uspace/srv/net/il/arp/arp.c

@@ -157 +157 @@
                         
                         arp_clear_addr(&proto->addresses);
-                        arp_addr_destroy(&proto->addresses);
-                }
-        }
-        
-        arp_protos_clear(&device->protos);
+                        arp_addr_destroy(&proto->addresses, free);
+                }
+        }
+        
+        arp_protos_clear(&device->protos, free);
 }
 
@@ -184 +184 @@
         }
         
-        arp_cache_clear(&arp_globals.cache);
+        arp_cache_clear(&arp_globals.cache, free);
         fibril_mutex_unlock(&arp_globals.lock);
         
@@ -212 +212 @@
                 arp_clear_trans(trans);
         
-        arp_addr_exclude(&proto->addresses, address->value, address->length);
+        arp_addr_exclude(&proto->addresses, address->value, address->length, free);
         
         fibril_mutex_unlock(&arp_globals.lock);
@@ -345 +345 @@
                             header->protocol_length, trans);
                         if (rc != EOK) {
-                                /* The generic char map has already freed trans! */
+                                free(trans);
                                 return rc;
                         }
@@ -556 +556 @@
                 if (index < 0) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return index;
@@ -569 +569 @@
                 if (device->phone < 0) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return EREFUSED;
@@ -579 +579 @@
                 if (rc != EOK) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -589 +589 @@
                 if (rc != EOK) {
                         fibril_mutex_unlock(&arp_globals.lock);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -601 +601 @@
                         free(device->addr);
                         free(device->addr_data);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -614 +614 @@
                         free(device->broadcast_addr);
                         free(device->broadcast_data);
-                        arp_protos_destroy(&device->protos);
+                        arp_protos_destroy(&device->protos, free);
                         free(device);
                         return rc;
@@ -746 +746 @@
                         arp_clear_trans(trans);
                         arp_addr_exclude(&proto->addresses, target->value,
-                            target->length);
+                            target->length, free);
                         return EAGAIN;
                 }
@@ -794 +794 @@
             trans);
         if (rc != EOK) {
-                /* The generic char map has already freed trans! */
+                free(trans);
                 return rc;
         }
@@ -807 +807 @@
                 arp_clear_trans(trans);
                 arp_addr_exclude(&proto->addresses, target->value,
-                    target->length);
+                    target->length, free);
                 return ENOENT;
         }

uspace/srv/net/il/ip/ip.c

@@ -505 +505 @@
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
-                ip_routes_destroy(&ip_netif->routes);
+                ip_routes_destroy(&ip_netif->routes, free);
                 free(ip_netif);
                 return rc;

uspace/srv/net/net/net.c

@@ -289 +289 @@
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME,
             (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service);
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME,
             (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service);
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME,
             (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service);
@@ -552 +555 @@
                 rc = read_netif_configuration(conf_files[i], netif);
                 if (rc != EOK) {
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return rc;
@@ -562 +565 @@
                 if (!setting) {
                         fprintf(stderr, "%s: Network interface name is missing\n", NAME);
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return EINVAL;
@@ -571 +574 @@
                 int index = netifs_add(&net_globals.netifs, netif->id, netif);
                 if (index < 0) {
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return index;
@@ -583 +586 @@
                     index);
                 if (rc != EOK) {
-                        measured_strings_destroy(&netif->configuration);
-                        netifs_exclude_index(&net_globals.netifs, index);
+                        measured_strings_destroy(&netif->configuration, free);
+                        netifs_exclude_index(&net_globals.netifs, index, free);
                         return rc;
                 }
@@ -590 +593 @@
                 rc = start_device(netif);
                 if (rc != EOK) {
-                        printf("%s: Error starting interface %s (%s)\n", NAME,
+                        printf("%s: Ignoring failed interface %s (%s)\n", NAME,
                             netif->name, str_error(rc));
-                        measured_strings_destroy(&netif->configuration);
-                        netifs_exclude_index(&net_globals.netifs, index);
-                        
-                        return rc;
+                        measured_strings_destroy(&netif->configuration, free);
+                        netifs_exclude_index(&net_globals.netifs, index, free);
+                        continue;
                 }
                 

uspace/srv/net/nil/eth/eth.c

@@ -214 +214 @@
         if (rc != EOK) {
                 free(eth_globals.broadcast_addr);
-                eth_devices_destroy(&eth_globals.devices);
+                eth_devices_destroy(&eth_globals.devices, free);
         }
 out:

uspace/srv/net/tl/tcp/tcp.c

@@ -1707 +1707 @@
                 if (socket->port > 0) {
                         socket_ports_exclude(&tcp_globals.sockets,
-                            socket->port);
+                            socket->port, free);
                         socket->port = 0;
                 }
@@ -2492 +2492 @@
         rc = packet_dimensions_initialize(&tcp_globals.dimensions);
         if (rc != EOK) {
-                socket_ports_destroy(&tcp_globals.sockets);
+                socket_ports_destroy(&tcp_globals.sockets, free);
                 goto out;
         }

uspace/srv/net/tl/udp/udp.c

@@ -417 +417 @@
         rc = packet_dimensions_initialize(&udp_globals.dimensions);
         if (rc != EOK) {
-                socket_ports_destroy(&udp_globals.sockets);
+                socket_ports_destroy(&udp_globals.sockets, free);
                 fibril_rwlock_write_unlock(&udp_globals.lock);
                 return rc;
@@ -434 +434 @@
             &data);
         if (rc != EOK) {
-                socket_ports_destroy(&udp_globals.sockets);
+                socket_ports_destroy(&udp_globals.sockets, free);
                 fibril_rwlock_write_unlock(&udp_globals.lock);
                 return rc;

uspace/srv/vfs/vfs_ops.c

@@ -1234 +1234 @@
         if (!parentc) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 async_answer_0(rid, rc);
                 free(old);
@@ -1251 +1252 @@
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 async_answer_0(rid, rc);
                 free(old);
@@ -1261 +1263 @@
             (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 async_answer_0(rid, EXDEV);     /* different file systems */
                 free(old);
@@ -1279 +1282 @@
                 if (!new_node) {
                         fibril_rwlock_write_unlock(&namespace_rwlock);
+                        vfs_node_put(old_node);
                         async_answer_0(rid, ENOMEM);
                         free(old);
@@ -1290 +1294 @@
         default:
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 async_answer_0(rid, ENOTEMPTY);
                 free(old);
@@ -1300 +1305 @@
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&namespace_rwlock);
+                vfs_node_put(old_node);
                 if (new_node)
                         vfs_node_put(new_node);