Changeset 205832b in mainline

Timestamp:

2012-11-05T15:37:39Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

f048658

Parents:

6b99156

Message:

Replaced 0 with NULL where appropriate (in rcu, cht, uspace hashtable, smp_call, workqueue).

Files:

• kernel/generic/src/adt/cht.c (modified) (16 diffs)
• kernel/generic/src/synch/rcu.c (modified) (18 diffs)
• kernel/test/cht/cht1.c (modified) (4 diffs)
• kernel/test/smpcall/smpcall1.c (modified) (1 diff)
• kernel/test/synch/rcu1.c (modified) (8 diffs)
• kernel/test/synch/workqueue2.c (modified) (2 diffs)
• kernel/test/synch/workqueue3.c (modified) (1 diff)
• uspace/lib/c/generic/adt/hash_table.c (modified) (2 diffs)

kernel/generic/src/adt/cht.c

@@ -151 +151 @@
 /* Sentinel node used by all buckets. Stores the greatest possible hash value.*/
 static const cht_link_t sentinel = {
-        .link = 0,
+        /* NULL and N_NORMAL */
+        .link = 0 | N_NORMAL,
         .hash = -1
 };
@@ -265 +266 @@
         h->max_load = (max_load == 0) ? CHT_MAX_LOAD : max_load;
         h->min_order = min_order;
-        h->new_b = 0;
+        h->new_b = NULL;
         h->op = op;
         atomic_set(&h->item_cnt, 0);
@@ -298 +299 @@
         
         if (!b)
-                return 0;
+                return NULL;
         
         b->order = order;
@@ -346 +347 @@
         
         free(h->b);
-        h->b = 0;
+        h->b = NULL;
         
         /* You must clear the table of items. Otherwise cht_destroy will leak. */
@@ -457 +458 @@
          */
 
-        cht_link_t *cur = 0;
+        cht_link_t *cur = NULL;
         marked_ptr_t prev = head;
 
@@ -492 +493 @@
         }
         
-        return 0;
+        return NULL;
 }
 
@@ -607 +608 @@
                          * points to an allocated join node (if non-null) even if marked 
                          * invalid. Before the resizer lets join nodes to be unlinked
-                         * (and freed) it sets old_head to 0 and waits for a grace period.
+                         * (and freed) it sets old_head to NULL and waits for a grace period.
                          * So either the invalid old_head points to join node; or old_head
                          * is null and we would have seen a completed bucket join while
@@ -616 +617 @@
                 }
                 
-                return 0;
+                return NULL;
         } else {
                 /* 
@@ -700 +701 @@
                         .ppred = phead,
                         .cur = get_next(*phead),
-                        .last = 0
+                        .last = NULL
                 };
                 
@@ -807 +808 @@
          */
         read_barrier();
-        return 0 != find_duplicate(h, item, hash, wnd->cur);
+        return NULL != find_duplicate(h, item, hash, wnd->cur);
 }
 
@@ -840 +841 @@
         }
         
-        return 0;       
+        return NULL;
 }
 
@@ -908 +909 @@
                         .ppred = phead,
                         .cur = get_next(*phead),
-                        .last = 0
+                        .last = NULL
                 };
                 
@@ -1194 +1195 @@
         }
 
-        /* wnd->cur may be 0 or even marked N_DELETED. */
+        /* wnd->cur may be NULL or even marked N_DELETED. */
         return true;
 }
@@ -1966 +1967 @@
         
         /* Not needed; just for increased readability. */
-        h->new_b = 0;
+        h->new_b = NULL;
 }
 
@@ -2065 +2066 @@
         
         /* Not needed; just for increased readability. */
-        h->new_b = 0;
+        h->new_b = NULL;
 }
 
@@ -2144 +2145 @@
 
         wnd_t wnd = {
-                .ppred = 0,
-                .cur = 0
+                .ppred = NULL,
+                .cur = NULL
         };
         marked_ptr_t *cur_link = new_head;

kernel/generic/src/synch/rcu.c

@@ -237 +237 @@
 #endif
         
-        rcu.detector_thr = 0;
+        rcu.detector_thr = NULL;
         
         rcu.stat_expedited_cnt = 0;
@@ -260 +260 @@
 #endif
         
-        CPU->rcu.cur_cbs = 0;
+        CPU->rcu.cur_cbs = NULL;
         CPU->rcu.cur_cbs_cnt = 0;
-        CPU->rcu.next_cbs = 0;
+        CPU->rcu.next_cbs = NULL;
         CPU->rcu.next_cbs_cnt = 0;
-        CPU->rcu.arriving_cbs = 0;
+        CPU->rcu.arriving_cbs = NULL;
         CPU->rcu.parriving_cbs_tail = &CPU->rcu.arriving_cbs;
         CPU->rcu.arriving_cbs_cnt = 0;
@@ -275 +275 @@
         /* BSP creates reclaimer threads before AP's rcu_cpu_init() runs. */
         if (config.cpu_active == 1)
-                CPU->rcu.reclaimer_thr = 0;
+                CPU->rcu.reclaimer_thr = NULL;
         
         CPU->rcu.stat_max_cbs = 0;
@@ -317 +317 @@
         /* Stop and wait for reclaimers. */
         for (unsigned int cpu_id = 0; cpu_id < config.cpu_active; ++cpu_id) {
-                ASSERT(cpus[cpu_id].rcu.reclaimer_thr != 0);
+                ASSERT(cpus[cpu_id].rcu.reclaimer_thr != NULL);
         
                 if (cpus[cpu_id].rcu.reclaimer_thr) {
@@ -323 +323 @@
                         thread_join(cpus[cpu_id].rcu.reclaimer_thr);
                         thread_detach(cpus[cpu_id].rcu.reclaimer_thr);
-                        cpus[cpu_id].rcu.reclaimer_thr = 0;
+                        cpus[cpu_id].rcu.reclaimer_thr = NULL;
                 }
         }
@@ -333 +333 @@
                 thread_join(rcu.detector_thr);
                 thread_detach(rcu.detector_thr);
-                rcu.detector_thr = 0;
+                rcu.detector_thr = NULL;
         }
 #endif
@@ -357 +357 @@
                 
                 cpus[cpu_id].rcu.reclaimer_thr = 
-                        thread_create(reclaimer, 0, TASK, THREAD_FLAG_NONE, name);
+                        thread_create(reclaimer, NULL, TASK, THREAD_FLAG_NONE, name);
 
                 if (!cpus[cpu_id].rcu.reclaimer_thr) 
@@ -373 +373 @@
 {
         rcu.detector_thr = 
-                thread_create(detector, 0, TASK, THREAD_FLAG_NONE, "rcu-det");
+                thread_create(detector, NULL, TASK, THREAD_FLAG_NONE, "rcu-det");
         
         if (!rcu.detector_thr) 
@@ -410 +410 @@
                  * to finish. 
                  * 
-                 * Note that THREAD may be 0 in scheduler() and not just during boot.
+                 * Note that THREAD may be NULL in scheduler() and not just during boot.
                  */
                 if ((THREAD && THREAD->rcu.was_preempted) || CPU->rcu.is_delaying_gp) {
@@ -522 +522 @@
         
         cpu_mask_for_each(*cpu_mask, cpu_id) {
-                smp_call(cpu_id, add_barrier_cb, 0);
+                smp_call(cpu_id, add_barrier_cb, NULL);
         }
         
@@ -583 +583 @@
         
         rcu_item->func = func;
-        rcu_item->next = 0;
+        rcu_item->next = NULL;
         
         preemption_disable();
@@ -611 +611 @@
 {
         ASSERT(THREAD && THREAD->wired);
-        return 0 == CPU->rcu.cur_cbs;
+        return NULL == CPU->rcu.cur_cbs;
 }
 
@@ -617 +617 @@
 {
         ASSERT(THREAD && THREAD->wired);
-        return 0 == CPU->rcu.next_cbs;
+        return NULL == CPU->rcu.next_cbs;
 }
 
@@ -628 +628 @@
          * a false negative if we race with a local interrupt handler.
          */
-        return 0 == CPU->rcu.arriving_cbs;
+        return NULL == CPU->rcu.arriving_cbs;
 }
 
@@ -741 +741 @@
         }
         
-        *phead = 0;
+        *phead = NULL;
 }
 
@@ -779 +779 @@
         CPU->rcu.next_cbs_cnt = CPU->rcu.arriving_cbs_cnt;
         
-        CPU->rcu.arriving_cbs = 0;
+        CPU->rcu.arriving_cbs = NULL;
         CPU->rcu.parriving_cbs_tail = &CPU->rcu.arriving_cbs;
         CPU->rcu.arriving_cbs_cnt = 0;
@@ -1289 +1289 @@
         atomic_set(&rcu.delaying_cpu_cnt, 0);
         
-        sample_cpus(cpu_mask, 0);
+        sample_cpus(cpu_mask, NULL);
 }
 
@@ -1452 +1452 @@
 void rcu_thread_exiting(void)
 {
-        ASSERT(THREAD != 0);
+        ASSERT(THREAD != NULL);
         ASSERT(THREAD->state == Exiting);
         ASSERT(PREEMPTION_DISABLED || interrupts_disabled());

kernel/test/cht/cht1.c

@@ -97 +97 @@
 static const char * do_sanity_test(cht_t *h)
 {
-        if (cht_find_lazy(h, 0))
+        if (cht_find_lazy(h, (void*)0))
                 return "Found lazy in empty table.";
         
-        if (cht_find(h, 0))
+        if (cht_find(h, (void*)0))
                 return "Found in empty table.";
         
-        if (cht_remove_key(h, 0))
+        if (cht_remove_key(h, (void*)0))
                 return "Removed from empty table.";
         
         const int val_cnt = 6;
-        val_t *v[6] = {0};
+        val_t *v[6] = { NULL };
         
         for (int i = 0; i < val_cnt; ++i)
@@ -145 +145 @@
         
         if (cht_find(h, (void*)0))
-                return "Fantom find.";
+                return "Phantom find.";
         
         cht_link_t *item = cht_find(h, (void*)v[5]->unique_id);
@@ -226 +226 @@
         }
 
-        return 0;
+        return NULL;
 }
 
@@ -559 +559 @@
                 return "CHT stress test failed.";
         else
-                return 0;
-}
+                return NULL;
+}

kernel/test/smpcall/smpcall1.c

@@ -85 +85 @@
         /* Number of received calls that were sent by cpu[i]. */
         size_t call_cnt[MAX_CPUS] = {0};
-        thread_t *thread[MAX_CPUS] = {0};
+        thread_t *thread[MAX_CPUS] = { NULL };
         
         unsigned int cpu_count = min(config.cpu_active, MAX_CPUS);

kernel/test/synch/rcu1.c

@@ -43 +43 @@
 
 static int one_idx = 0;
-static thread_t *thread[MAX_THREADS] = {0};
+static thread_t *thread[MAX_THREADS] = { NULL };
 
 typedef struct {
@@ -100 +100 @@
         
         for (size_t i = 0; i < thread_cnt; ++i) {
-                run_thread(i, func, 0);
+                run_thread(i, func, NULL);
         }
 }
@@ -123 +123 @@
                         
                         thread_detach(thread[i]);
-                        thread[i] = 0;
+                        thread[i] = NULL;
                 }
         }
@@ -145 +145 @@
                 thread_join(thread[one_idx]);
                 thread_detach(thread[one_idx]);
-                thread[one_idx] = 0;
+                thread[one_idx] = NULL;
         }
 }
@@ -337 +337 @@
         
         TPRINTF("\nRun a single reader that posts one callback.\n");
-        run_one(one_cb_reader, 0);
+        run_one(one_cb_reader, NULL);
         join_one();
         
@@ -1015 +1015 @@
                 { 0, do_expedite, "do_expedite" },
                 { 1, do_stress, "do_stress" },
-                { 0, 0, 0 }
+                { 0, NULL, NULL }
         };
         
@@ -1023 +1023 @@
         uint64_t delta_gps = 0;
         
-        for (int i = 0; test_func[i].func != 0; ++i) {
+        for (int i = 0; test_func[i].func; ++i) {
                 if (!test_func[i].include) {
                         TPRINTF("\nSubtest %s() skipped.\n", test_func[i].desc);
@@ -1047 +1047 @@
 
         if (success)
-                return 0;
+                return NULL;
         else
                 return "One of the tests failed.";

kernel/test/synch/workqueue2.c

@@ -116 +116 @@
         test_custom_workq_impl(true, "test-workq-stop");
         /* Errors are expected. */
-        return 0;
+        return NULL;
 }
 
@@ -122 +122 @@
 const char *test_workqueue_all(void)
 {
-        const char *err = 0;
+        const char *err = NULL;
         const char *res;
         

kernel/test/synch/workqueue3.c

@@ -56 +56 @@
 static const char *do_test(bool exit_early)
 {
-        const char *err = 0;
+        const char *err = NULL;
         TPRINTF("Stress testing system queue.\n");
         TPRINTF("First run:\n");

uspace/lib/c/generic/adt/hash_table.c

@@ -112 +112 @@
         h->apply_ongoing = false;
 
-        if (h->op->remove_callback == 0) {
+        if (h->op->remove_callback == NULL) {
                 h->op->remove_callback = nop_remove_callback;
         }
@@ -133 +133 @@
         free(h->bucket);
 
-        h->bucket = 0;
+        h->bucket = NULL;
         h->bucket_cnt = 0;
 }