Changes in / [d7b7f5e:1c0cef0] in mainline

Files:

• kernel/arch/mips32/include/arch/asm.h (modified) (1 diff)
• kernel/generic/src/debug/panic.c (modified) (1 diff)
• kernel/generic/src/mm/frame.c (modified) (1 diff)
• uspace/app/netspeed/netspeed.c (modified) (5 diffs)
• uspace/app/wavplay/dplay.c (modified) (5 diffs)
• uspace/app/wavplay/main.c (modified) (2 diffs)
• uspace/app/wavplay/wave.c (modified) (2 diffs)
• uspace/lib/gui/window.c (modified) (1 diff)
• uspace/srv/audio/hound/audio_device.c (modified) (1 diff)
• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (1 diff)
• uspace/srv/fs/mfs/mfs.h (modified) (2 diffs)
• uspace/srv/fs/mfs/mfs_balloc.c (modified) (2 diffs)
• uspace/srv/fs/mfs/mfs_ops.c (modified) (2 diffs)
• uspace/srv/hid/compositor/compositor.c (modified) (1 diff)

kernel/arch/mips32/include/arch/asm.h ¶

@@ -42 +42 @@
 NO_TRACE static inline void cpu_sleep(void)
 {
-        /*
-         * Unfortunatelly most of the simulators do not support
-         *
-         * asm volatile (
-         *     "wait"
-         * );
-         *
-         */
+        asm volatile ("wait");
 }
 

kernel/generic/src/debug/panic.c ¶

@@ -96 +96 @@
         printf("THE=%p: ", THE);
         if (THE != NULL) {
-                printf("pe=%" PRIun " thr=%p task=%p cpu=%p as=%p"
+                printf("pd=%" PRIun " thread=%p task=%p cpu=%p as=%p"
                     " magic=%#" PRIx32 "\n", THE->preemption_disabled,
                     THE->thread, THE->task, THE->cpu, THE->as, THE->magic);
+                
+                if (THE->thread != NULL)
+                        printf("thread=\"%s\"\n", THE->thread->name);
+                
+                if (THE->task != NULL)
+                        printf("task=\"%s\"\n", THE->task->name);
         } else
                 printf("invalid\n");

kernel/generic/src/mm/frame.c ¶

@@ -443 +443 @@
 NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
 {
-        if (!(zone->flags & ZONE_AVAILABLE))
-                return;
+        ASSERT(zone->flags & ZONE_AVAILABLE);
         
         frame_t *frame = zone_get_frame(zone, index);

uspace/app/netspeed/netspeed.c ¶

@@ -63 +63 @@
 
         int listen_sd = socket(PF_INET, sock_type, 0);
-        if (listen_sd < 0)
+        if (listen_sd < 0) {
                 fprintf(stderr, "socket failed: %s\n", str_error(rc));
                 return rc;
+        }
         
         rc = bind(listen_sd, (struct sockaddr *) &addr, sizeof(addr));
@@ -92 +93 @@
                         return conn_sd;
                 }
-        }
-        else {
+        } else {
                 conn_sd = listen_sd;
         }
@@ -150 +150 @@
                 if (sock_type == SOCK_STREAM) {
                         rc = send(conn_sd, buf, bufsize, 0);
-                }
-                else {
+                } else {
                         rc = sendto(conn_sd, buf, bufsize, 0,
                             (struct sockaddr *) &addr, sizeof(addr));
@@ -181 +180 @@
         if (str_cmp(argv[1], "tcp") == 0) {
                 sock_type = SOCK_STREAM;
-        }
-        else if (str_cmp(argv[1], "udp") == 0) {
+        } else if (str_cmp(argv[1], "udp") == 0) {
                 sock_type = SOCK_DGRAM;
-        }
-        else {
+        } else {
                 fprintf(stderr, "Invalid socket type\n");
                 syntax_print();
@@ -266 +263 @@
                 if (rc != EOK)
                         fprintf(stderr, "Server failed: %s\n", str_error(rc));
-        }
-        else {
+        } else {
                 rc = client(sock_type, address, port, count, buf, bufsize);
                 if (rc != EOK)

uspace/app/wavplay/dplay.c ¶

@@ -151 +151 @@
             device_event_callback, pb);
         if (ret != EOK) {
-                printf("Failed to register event callback.\n");
+                printf("Failed to register event callback: %s.\n",
+                    str_error(ret));
                 return;
         }
@@ -285 +286 @@
                             pb->f.sample_format);
                         if (ret != EOK) {
-                                printf("Failed to start playback\n");
+                                printf("Failed to start playback: %s\n",
+                                    str_error(ret));
                                 return;
                         }
@@ -291 +293 @@
                         ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                         if (ret != EOK) {
-                                printf("Failed to update position indicator\n");
+                                printf("Failed to update position indicator "
+                                   "%s\n", str_error(ret));
                         }
                 }
@@ -308 +311 @@
                 const int ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                 if (ret != EOK) {
-                        printf("Failed to update position indicator\n");
+                        printf("Failed to update position indicator %s\n",
+                            str_error(ret));
                 }
                 getuptime(&time);
@@ -350 +354 @@
         ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {
-                printf("Failed to get PCM info.\n");
+                printf("Failed to get PCM info: %s.\n", str_error(ret));
                 goto close_session;
         }

uspace/app/wavplay/main.c ¶

@@ -79 +79 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+                printf("Error parsing `%s' wav header: %s.\n", filename, error);
                 fclose(source);
                 return EINVAL;
         }
+
+        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
+            format.channels, format.sampling_rate,
+            pcm_sample_format_str(format.sample_format));
 
         /* Allocate buffer and create new context */
@@ -136 +140 @@
             &format.sampling_rate, &format.sample_format, &error);
         if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+                printf("Error parsing `%s' wav header: %s.\n", filename, error);
                 fclose(source);
                 return EINVAL;
         }
+        printf("File `%s' format: %u channel(s), %uHz, %s.\n", filename,
+            format.channels, format.sampling_rate,
+            pcm_sample_format_str(format.sample_format));
 
         /* Connect new playback context */

uspace/app/wavplay/wave.c ¶

@@ -81 +81 @@
         }
 
-        if (uint16_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
+        if (uint32_t_le2host(header->subchunk1_size) != PCM_SUBCHUNK1_SIZE) {
+                //TODO subchunk 1 sizes other than 16 are allowed ( 18, 40)
+                //http://www-mmsp.ece.mcgill.ca/documents/AudioFormats/WAVE/WAVE.html
                 if (error)
                         *error = "invalid subchunk1 size";
-                return EINVAL;
+//              return EINVAL;
         }
 
@@ -94 +96 @@
 
         if (str_lcmp(header->subchunk2_id, SUBCHUNK2_ID, 4) != 0) {
+                //TODO basedd on subchunk1 size, we might be reading wrong
+                //offset
                 if (error)
                         *error = "invalid subchunk2 id";
-                return EINVAL;
+//              return EINVAL;
         }
 
 
+        //TODO data and data_size are incorrect in extended wav formats
+        //pcm params are OK
         if (data)
                 *data = header->data;

uspace/lib/gui/window.c ¶

@@ -66 +66 @@
 
 static pixel_t border_color = PIXEL(255, 0, 0, 0);
-static pixel_t header_bg_focus_color = PIXEL(255, 25, 25, 112);
+static pixel_t header_bg_focus_color = PIXEL(255, 88, 106, 196);
 static pixel_t header_fg_focus_color = PIXEL(255, 255, 255, 255);
-static pixel_t header_bg_unfocus_color = PIXEL(255, 70, 130, 180);
+static pixel_t header_bg_unfocus_color = PIXEL(255, 12, 57, 92);
 static pixel_t header_fg_unfocus_color = PIXEL(255, 255, 255, 255);
 

uspace/srv/audio/hound/audio_device.c ¶

@@ -162 +162 @@
                 }
                 audio_pcm_register_event_callback(dev->sess,
-                    device_event_callback, dev);\
+                    device_event_callback, dev);
 
                 /* Fill the buffer first. Fill the first two fragments,

uspace/srv/fs/ext4fs/ext4fs_ops.c ¶

@@ -876 +876 @@
         if (rc != EOK)
                 return rc;
-        if (NULL == inst)
-                return ENOENT;
 
         ext4_superblock_t *sb = inst->filesystem->superblock;

uspace/srv/fs/mfs/mfs.h ¶

@@ -44 +44 @@
 #include <errno.h>
 #include <assert.h>
+#include <stdbool.h>
 #include "../../vfs/vfs.h"
 
@@ -105 +106 @@
         unsigned isearch;
         unsigned zsearch;
+
+        /* Indicates wether if the cached number of free zones
+         * is to be considered valid or not.
+         */
+        bool nfree_zones_valid;
+        /* Cached number of free zones, used to avoid to scan
+         * the whole bitmap every time the mfs_free_block_count()
+         * is invoked.
+         */
+        unsigned nfree_zones;
 };
 

uspace/srv/fs/mfs/mfs_balloc.c ¶

@@ -88 +88 @@
 {
         int r = mfs_alloc_bit(inst, zone, BMAP_ZONE);
+        if (r != EOK)
+                return r;
+
+        /* Update the cached number of free zones */
+        struct mfs_sb_info *sbi = inst->sbi;
+        if (sbi->nfree_zones_valid)
+                sbi->nfree_zones--;
 
         *zone += inst->sbi->firstdatazone - 1;
@@ -103 +110 @@
 mfs_free_zone(struct mfs_instance *inst, uint32_t zone)
 {
+        int r;
+
         zone -= inst->sbi->firstdatazone - 1;
 
-        return mfs_free_bit(inst, zone, BMAP_ZONE);
+        r = mfs_free_bit(inst, zone, BMAP_ZONE);
+        if (r != EOK)
+                return r;
+
+        /* Update the cached number of free zones */
+        struct mfs_sb_info *sbi = inst->sbi;
+        if (sbi->nfree_zones_valid)
+                sbi->nfree_zones++;
+
+        return r;
 }
 

uspace/srv/fs/mfs/mfs_ops.c ¶

@@ -216 +216 @@
         sbi->isearch = 0;
         sbi->zsearch = 0;
+        sbi->nfree_zones_valid = false;
+        sbi->nfree_zones = 0;
 
         if (version == MFS_VERSION_V3) {
@@ -1181 +1183 @@
                 return rc;
 
-        if (NULL == inst)
-                return ENOENT;
-
-        mfs_count_free_zones(inst, &block_free);
-        *count = block_free;
-
-        return EOK;
+        struct mfs_sb_info *sbi = inst->sbi;
+
+        if (!sbi->nfree_zones_valid) {
+                /* The cached number of free zones is not valid,
+                 * we need to scan the bitmap to retrieve the
+                 * current value.
+                 */
+
+                rc = mfs_count_free_zones(inst, &block_free);
+                if (rc != EOK)
+                        return rc;
+
+                sbi->nfree_zones = block_free;
+                sbi->nfree_zones_valid = true;
+        }
+
+        *count = sbi->nfree_zones;
+
+        return rc;
 }
 

uspace/srv/hid/compositor/compositor.c ¶

@@ -2176 +2176 @@
         
         /* Color of the viewport background. Must be opaque. */
-        bg_color = PIXEL(255, 75, 70, 75);
+        bg_color = PIXEL(255, 69, 51, 103);
         
         /* Register compositor server. */