Changeset 690ad20 in mainline for uspace/app/kio/kio.c

Timestamp:

2025-04-17T15:29:16Z (5 days ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

39e1b9a

Parents:

d5b37b6

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-11 20:06:16)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-17 15:29:16)

Message:

Convert kio buffer to bytes (part 1)

File:

• uspace/app/kio/kio.c (modified) (4 diffs)

uspace/app/kio/kio.c

@@ -59 +59 @@
 typedef struct {
         link_t link;
-        size_t length;
-        char32_t *data;
+        size_t bytes;
+        char *data;
 } item_t;
 
@@ -68 +68 @@
 static FIBRIL_MUTEX_INITIALIZE(mtx);
 
-#define READ_BUFFER_SIZE (PAGE_SIZE / sizeof(char32_t))
+#define READ_BUFFER_SIZE PAGE_SIZE
 
 static size_t current_at;
-static char32_t read_buffer[READ_BUFFER_SIZE];
+static char read_buffer[READ_BUFFER_SIZE];
 
 /** Klog producer
@@ -82 +82 @@
  *
  */
-static void producer(size_t length, char32_t *data)
-{
-        item_t *item = (item_t *) malloc(sizeof(item_t));
+static void producer(size_t bytes, char *data)
+{
+        item_t *item = malloc(sizeof(item_t));
         if (item == NULL)
                 return;
 
-        size_t sz = sizeof(char32_t) * length;
-        char32_t *buf = (char32_t *) malloc(sz);
-        if (buf == NULL) {
+        item->bytes = bytes;
+        item->data = malloc(bytes);
+        if (!item->data) {
                 free(item);
                 return;
         }
 
-        memcpy(buf, data, sz);
+        memcpy(item->data, data, bytes);
 
         link_initialize(&item->link);
-        item->length = length;
-        item->data = buf;
         prodcons_produce(&pc, &item->link);
 }
@@ -125 +123 @@
                 item_t *item = list_get_instance(link, item_t, link);
 
-                for (size_t i = 0; i < item->length; i++)
-                        putuchar(item->data[i]);
-
-                if (log != NULL) {
-                        for (size_t i = 0; i < item->length; i++)
-                                fputuc(item->data[i], log);
-
+                fwrite(item->data, 1, item->bytes, stdout);
+
+                if (log) {
+                        fwrite(item->data, 1, item->bytes, log);
                         fflush(log);
                         vfs_sync(fileno(log));