Changeset a35b458 in mainline for kernel/generic/src/log/log.c

Timestamp:

2018-03-02T20:10:49Z (6 years ago)

Author:

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

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• kernel/generic/src/log/log.c (modified) (19 diffs)

kernel/generic/src/log/log.c

@@ -121 +121 @@
                 len = LOG_LENGTH - log_current_len;
         }
-        
+
         if (len == 0)
                 return;
-        
+
         size_t log_free = LOG_LENGTH - log_used - log_current_len;
-        
+
         /* Discard older entries to make space, if necessary */
         while (len > log_free) {
@@ -136 +136 @@
                 next_for_uspace -= entry_len;
         }
-        
+
         size_t pos = (log_current_start + log_current_len) % LOG_LENGTH;
         log_copy_to(data, pos, len);
@@ -151 +151 @@
         spinlock_lock(&log_lock);
         spinlock_lock(&kio_lock);
-        
+
         log_current_start = (log_start + log_used) % LOG_LENGTH;
         log_current_len = 0;
-        
+
         /* Write header of the log entry, the length will be written in log_end() */
         log_append((uint8_t *) &log_current_len, sizeof(size_t));
@@ -162 +162 @@
         log_append((uint8_t *) &fac32, sizeof(uint32_t));
         log_append((uint8_t *) &lvl32, sizeof(uint32_t));
-        
+
         log_counter++;
 }
@@ -174 +174 @@
         log_copy_to((uint8_t *) &log_current_len, log_current_start, sizeof(size_t));
         log_used += log_current_len;
-        
+
         kio_push_char('\n');
         spinlock_unlock(&kio_lock);
         spinlock_unlock(&log_lock);
-        
+
         /* This has to be called after we released the locks above */
         kio_flush();
@@ -189 +189 @@
         if (!atomic_get(&log_inited))
                 return;
-        
+
         spinlock_lock(&log_lock);
         if (next_for_uspace < log_used)
@@ -200 +200 @@
         size_t offset = 0;
         size_t chars = 0;
-        
+
         while (offset < size) {
                 kio_push_char(str_decode(str, &offset, size));
                 chars++;
         }
-        
+
         log_append((const uint8_t *)str, size);
-        
+
         return chars;
 }
@@ -216 +216 @@
         size_t offset = 0;
         size_t chars = 0;
-        
+
         for (offset = 0; offset < size; offset += sizeof(wchar_t), chars++) {
                 kio_push_char(wstr[chars]);
-                
+
                 size_t buffer_offset = 0;
                 errno_t rc = chr_encode(wstr[chars], buffer, &buffer_offset, 16);
@@ -225 +225 @@
                         return EOF;
                 }
-                
+
                 log_append((const uint8_t *)buffer, buffer_offset);
         }
-        
+
         return chars;
 }
@@ -239 +239 @@
 {
         int ret;
-        
+
         printf_spec_t ps = {
                 log_printf_str_write,
@@ -245 +245 @@
                 NULL
         };
-        
-        
+
+
         ret = printf_core(fmt, &ps, args);
-        
+
         return ret;
 }
@@ -260 +260 @@
         int ret;
         va_list args;
-        
+
         va_start(args, fmt);
         ret = log_vprintf(fmt, args);
         va_end(args);
-        
+
         return ret;
 }
@@ -278 +278 @@
         int ret;
         va_list args;
-        
+
         log_begin(fac, level);
-        
+
         va_start(args, fmt);
         ret = log_vprintf(fmt, args);
         va_end(args);
-        
+
         log_end();
-        
+
         return ret;
 }
@@ -298 +298 @@
         char *data;
         errno_t rc;
-        
+
         if (size > PAGE_SIZE)
                 return (sys_errno_t) ELIMIT;
-        
+
         switch (operation) {
                 case KLOG_WRITE:
@@ -307 +307 @@
                         if (!data)
                                 return (sys_errno_t) ENOMEM;
-                        
+
                         rc = copy_from_uspace(data, buf, size);
                         if (rc) {
@@ -314 +314 @@
                         }
                         data[size] = 0;
-                        
+
                         if (level >= LVL_LIMIT)
                                 level = LVL_NOTE;
-                        
+
                         log(LF_USPACE, level, "%s", data);
-                        
+
                         free(data);
                         return EOK;
@@ -326 +326 @@
                         if (!data)
                                 return (sys_errno_t) ENOMEM;
-                        
+
                         size_t entry_len = 0;
                         size_t copied = 0;
-                        
+
                         rc = EOK;
-        
+
                         spinlock_lock(&log_lock);
-                        
+
                         while (next_for_uspace < log_used) {
                                 size_t pos = (log_start + next_for_uspace) % LOG_LENGTH;
                                 log_copy_from((uint8_t *) &entry_len, pos, sizeof(size_t));
-                                
+
                                 if (entry_len > PAGE_SIZE) {
                                         /*
@@ -350 +350 @@
                                         continue;
                                 }
-                                
+
                                 if (size < copied + entry_len) {
                                         if (copied == 0)
@@ -356 +356 @@
                                         break;
                                 }
-                                
+
                                 log_copy_from((uint8_t *) (data + copied), pos, entry_len);
                                 copied += entry_len;
                                 next_for_uspace += entry_len;
                         }
-                        
+
                         spinlock_unlock(&log_lock);
-                        
+
                         if (rc != EOK) {
                                 free(data);
                                 return (sys_errno_t) rc;
                         }
-                        
+
                         rc = copy_to_uspace(buf, data, size);
-                        
+
                         free(data);
-                        
+
                         if (rc != EOK)
                                 return (sys_errno_t) rc;
-                        
+
                         return copy_to_uspace(uspace_nread, &copied, sizeof(copied));
                         return EOK;