Changeset 3bacee1 in mainline for kernel/generic/src/synch/workqueue.c

Timestamp:

2018-04-12T16:27:17Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

File:

• kernel/generic/src/synch/workqueue.c (modified) (12 diffs)

kernel/generic/src/synch/workqueue.c

@@ -133 +133 @@
 static void wait_for_workers(struct work_queue *workq);
 static int _workq_enqueue(struct work_queue *workq, work_t *work_item,
-        work_func_t func, bool can_block);
+    work_func_t func, bool can_block);
 static void init_work_item(work_t *work_item, work_func_t func);
 static signal_op_t signal_worker_logic(struct work_queue *workq, bool can_block);
@@ -185 +185 @@
 
 /** Creates and initializes a work queue. Returns NULL upon failure. */
-struct work_queue * workq_create(const char *name)
+struct work_queue *workq_create(const char *name)
 {
         struct work_queue *workq = malloc(sizeof(struct work_queue), 0);
@@ -269 +269 @@
 
         thread_t *thread = thread_create(worker_thread, workq, TASK,
-                THREAD_FLAG_NONE, workq->name);
+            THREAD_FLAG_NONE, workq->name);
 
         if (!thread) {
@@ -428 +428 @@
  */
 bool workq_enqueue_noblock(struct work_queue *workq, work_t *work_item,
-        work_func_t func)
+    work_func_t func)
 {
         return _workq_enqueue(workq, work_item, func, false);
@@ -473 +473 @@
  */
 static int _workq_enqueue(struct work_queue *workq, work_t *work_item,
-        work_func_t func, bool can_block)
+    work_func_t func, bool can_block)
 {
         assert(!workq_corrupted(workq));
@@ -614 +614 @@
 
                 size_t remaining_idle =
-                        workq->idle_worker_cnt - workq->activate_pending;
+                    workq->idle_worker_cnt - workq->activate_pending;
 
                 /* Idle workers still exist - activate one. */
@@ -628 +628 @@
                 } else {
                         /* No idle workers remain. Request that a new one be created. */
-                        bool need_worker = (active < max_concurrent_workers)
-                                && (workq->cur_worker_cnt < max_worker_cnt);
+                        bool need_worker = (active < max_concurrent_workers) &&
+                            (workq->cur_worker_cnt < max_worker_cnt);
 
                         if (need_worker && can_block) {
@@ -780 +780 @@
 
         _condvar_wait_timeout_irq_spinlock(&workq->activate_worker,
-                &workq->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
+            &workq->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
 
         assert(!workq_corrupted(workq));
@@ -855 +855 @@
         bool worker_surplus = worker_unnecessary(workq);
         const char *load_str = worker_surplus ? "decreasing" :
-                (0 < workq->activate_pending) ? "increasing" : "stable";
+            (0 < workq->activate_pending) ? "increasing" : "stable";
 
         irq_spinlock_unlock(&workq->lock, true);
 
         printf(
-                "Configuration: max_worker_cnt=%zu, min_worker_cnt=%zu,\n"
-                " max_concurrent_workers=%zu, max_items_per_worker=%zu\n"
-                "Workers: %zu\n"
-                "Active:  %zu (workers currently processing work)\n"
-                "Blocked: %zu (work functions sleeping/blocked)\n"
-                "Idle:    %zu (idle workers waiting for more work)\n"
-                "Items:   %zu (queued not yet dispatched work)\n"
-                "Stopping: %d\n"
-                "Load: %s\n",
-                max_worker_cnt, min_worker_cnt,
-                max_concurrent_workers, max_items_per_worker,
-                total,
-                active,
-                blocked,
-                idle,
-                items,
-                stopping,
-                load_str
-        );
+            "Configuration: max_worker_cnt=%zu, min_worker_cnt=%zu,\n"
+            " max_concurrent_workers=%zu, max_items_per_worker=%zu\n"
+            "Workers: %zu\n"
+            "Active:  %zu (workers currently processing work)\n"
+            "Blocked: %zu (work functions sleeping/blocked)\n"
+            "Idle:    %zu (idle workers waiting for more work)\n"
+            "Items:   %zu (queued not yet dispatched work)\n"
+            "Stopping: %d\n"
+            "Load: %s\n",
+            max_worker_cnt, min_worker_cnt,
+            max_concurrent_workers, max_items_per_worker,
+            total,
+            active,
+            blocked,
+            idle,
+            items,
+            stopping,
+            load_str);
 }
 
@@ -896 +895 @@
         while (list_empty(&info->work_queues) && !stop) {
                 errno_t ret = _condvar_wait_timeout_irq_spinlock(&info->req_cv,
-                        &info->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
+                    &info->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
 
                 stop = (ret == EINTR);
@@ -903 +902 @@
         if (!stop) {
                 *pworkq = list_get_instance(list_first(&info->work_queues),
-                        struct work_queue, nb_link);
+                    struct work_queue, nb_link);
 
                 assert(!workq_corrupted(*pworkq));
@@ -933 +932 @@
 
         nonblock_adder.thread = thread_create(thr_nonblock_add_worker,
-                &nonblock_adder, TASK, THREAD_FLAG_NONE, "kworkq-nb");
+            &nonblock_adder, TASK, THREAD_FLAG_NONE, "kworkq-nb");
 
         if (nonblock_adder.thread) {