Changeset 1b20da0 in mainline for kernel/test/synch/rcu1.c


Ignore:
Timestamp:
2018-02-28T17:52:03Z (7 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:
3061bc1
Parents:
df6ded8
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:26:03)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:52:03)
Message:

style: Remove trailing whitespace on non-empty lines, in certain file types.

Command used: tools/srepl '\([^[:space:]]\)\s\+$' '\1' -- *.c *.h *.py *.sh *.s *.S *.ag

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/test/synch/rcu1.c

    rdf6ded8 r1b20da0  
    8282        assert(thread[k] == NULL);
    8383       
    84         thread[k] = thread_create(func, arg, TASK, THREAD_FLAG_NONE, 
     84        thread[k] = thread_create(func, arg, TASK, THREAD_FLAG_NONE,
    8585                "test-rcu-thread");
    8686               
     
    223223        get_seq(10, 1000 * 1000, get_thread_cnt(), seq);
    224224       
    225         TPRINTF("\nRun %zu thr: repeat long reader sections, will preempt, no cbs.\n", 
     225        TPRINTF("\nRun %zu thr: repeat long reader sections, will preempt, no cbs.\n",
    226226                get_thread_cnt());
    227227       
     
    273273        size_t max_used_mem = sizeof(rcu_item_t) * exp_cnt;
    274274       
    275         TPRINTF("\nRun %zu thr: post %zu no-op callbacks (%zu B used), no readers.\n", 
     275        TPRINTF("\nRun %zu thr: post %zu no-op callbacks (%zu B used), no readers.\n",
    276276                get_thread_cnt(), exp_cnt, max_used_mem);
    277277       
     
    414414                        rcu_read_unlock();
    415415                       
    416                         if (seq_test_result != EOK) 
     416                        if (seq_test_result != EOK)
    417417                                return;
    418418                }
     
    476476       
    477477        TPRINTF("\nRun %zu th: check callback completion time in readers. "
    478                 "%zu callbacks total (max %" PRIu64 " %s used). Be patient.\n", 
     478                "%zu callbacks total (max %" PRIu64 " %s used). Be patient.\n",
    479479                get_thread_cnt(), total_cbs, mem_units, mem_suffix);
    480480       
     
    490490        } else if (seq_test_result == ERACE) {
    491491                TPRINTF("\nERROR: race detected!!\n");
    492         } 
     492        }
    493493       
    494494        return seq_test_result == EOK;
     
    531531        p->exited = false;
    532532       
    533         run_one(reader_exit, p);       
     533        run_one(reader_exit, p);
    534534        join_one();
    535535       
     
    575575        rcu_read_unlock();
    576576
    577         /* 
    578          * Start GP after exiting reader section w/ preemption. 
     577        /*
     578         * Start GP after exiting reader section w/ preemption.
    579579         * Just check that the callback does not lock up and is not lost.
    580580         */
     
    590590       
    591591        TPRINTF("reader_inside_cur{ ");
    592         /* 
    593          * Start a GP and try to finish the reader before 
    594          * the GP ends (including preemption). 
     592        /*
     593         * Start a GP and try to finish the reader before
     594         * the GP ends (including preemption).
    595595         */
    596596        rcu_call(&p->e.rcu, preempted_unlocked);
     
    667667        rcu_call(&p->e.rcu, preempted_unlocked);
    668668
    669         /* 
    670          * Preempt twice while GP is running after we've been known 
     669        /*
     670         * Preempt twice while GP is running after we've been known
    671671         * to hold up the GP just to make sure multiple preemptions
    672672         * are properly tracked if a reader is delaying the cur GP.
     
    695695        p->result = EOK;
    696696       
    697         run_one(f, p); 
     697        run_one(f, p);
    698698        join_one();
    699699       
     
    718718        bool ok = true;
    719719       
    720         ok = do_one_reader_preempt(preempted_reader_prev, 
     720        ok = do_one_reader_preempt(preempted_reader_prev,
    721721                "Err: preempted_reader_prev()\n");
    722722        success = success && ok;
    723723       
    724         ok = do_one_reader_preempt(preempted_reader_inside_cur, 
     724        ok = do_one_reader_preempt(preempted_reader_inside_cur,
    725725                "Err: preempted_reader_inside_cur()\n");
    726726        success = success && ok;
    727727       
    728         ok = do_one_reader_preempt(preempted_reader_cur, 
     728        ok = do_one_reader_preempt(preempted_reader_cur,
    729729                "Err: preempted_reader_cur()\n");
    730730        success = success && ok;
    731731       
    732         ok = do_one_reader_preempt(preempted_reader_next1, 
     732        ok = do_one_reader_preempt(preempted_reader_next1,
    733733                "Err: preempted_reader_next1()\n");
    734734        success = success && ok;
    735735
    736         ok = do_one_reader_preempt(preempted_reader_next2, 
     736        ok = do_one_reader_preempt(preempted_reader_next2,
    737737                "Err: preempted_reader_next2()\n");
    738738        success = success && ok;
     
    788788        synch->synch_running = false;
    789789       
    790         run_one(synch_reader, synch);   
     790        run_one(synch_reader, synch);
    791791       
    792792        /* Wait for the reader to enter its critical section. */
     
    866866                rcu_read_unlock();
    867867               
    868                 /* 
     868                /*
    869869                 * Do some work outside of the reader section so we are not always
    870870                 * preempted in the reader section.
     
    905905        size_t cb_per_thread = 1000 * 1000;
    906906        bool done = false;
    907         stress_t master = { .iters = cb_per_thread, .master = true }; 
    908         stress_t worker = { .iters = cb_per_thread, .master = false }; 
     907        stress_t master = { .iters = cb_per_thread, .master = true };
     908        stress_t worker = { .iters = cb_per_thread, .master = false };
    909909       
    910910        size_t thread_cnt = min(MAX_THREADS / 2, config.cpu_active);
     
    921921
    922922        TPRINTF("\nStress: Run %zu nop-readers and %zu updaters. %zu callbacks"
    923                 " total (max %" PRIu64 " %s used). Be very patient.\n", 
     923                " total (max %" PRIu64 " %s used). Be very patient.\n",
    924924                reader_cnt, updater_cnt, exp_upd_calls, mem_units, mem_suffix);
    925925       
     
    10441044                completed_gps += delta_gps;
    10451045
    1046                 if (ok) { 
    1047                         TPRINTF("\nSubtest %s() ok (GPs: %" PRIu64 ").\n", 
     1046                if (ok) {
     1047                        TPRINTF("\nSubtest %s() ok (GPs: %" PRIu64 ").\n",
    10481048                                test_func[i].desc, delta_gps);
    10491049                } else {
    10501050                        TPRINTF("\nFailed: %s(). Pausing for 5 secs.\n", test_func[i].desc);
    10511051                        thread_sleep(5);
    1052                 } 
     1052                }
    10531053        }
    10541054
Note: See TracChangeset for help on using the changeset viewer.