Changeset f56e897f in mainline for kernel/generic/src

Timestamp:

2010-06-29T17:43:38Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6473d41

Parents:

e4a4b44 (diff), 793cf029 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainlnie changes.

Location:

kernel/generic/src

Files:

• debug/symtab.c (modified) (3 diffs)
• interrupt/interrupt.c (modified) (1 diff)
• ipc/sysipc.c (modified) (1 diff)
• main/kinit.c (modified) (2 diffs)
• mm/frame.c (modified) (2 diffs)
• mm/tlb.c (modified) (4 diffs)
• proc/program.c (modified) (1 diff)
• smp/ipi.c (modified) (2 diffs)

kernel/generic/src/debug/symtab.c

@@ -46 +46 @@
 /** Get name of a symbol that seems most likely to correspond to address.
  *
- * @param addr          Address.
- * @param name          Place to store pointer to the symbol name.
- * @param offset        Place to store offset from the symbol address.
+ * @param addr   Address.
+ * @param name   Place to store pointer to the symbol name.
+ * @param offset Place to store offset from the symbol address.
  *
  * @return Zero on success or negative error code, ENOENT if not found,
@@ -83 +83 @@
 /** Lookup symbol by address and format for display.
  *
- * Returns name of closest corresponding symbol, "Not found" if none exists
- * or "N/A" if no symbol information is available.
+ * Returns name of closest corresponding symbol,
+ * "unknown" if none exists and "N/A" if no symbol
+ * information is available.
  *
  * @param addr Address.
@@ -101 +102 @@
                 return name;
         case ENOENT:
-                return "Not found";
+                return "unknown";
         default:
                 return "N/A";

kernel/generic/src/interrupt/interrupt.c

@@ -143 +143 @@
         uint64_t end_cycle = get_cycle();
         
+        irq_spinlock_lock(&exctbl_lock, false);
         exc_table[n].cycles += end_cycle - begin_cycle;
         exc_table[n].count++;
+        irq_spinlock_unlock(&exctbl_lock, false);
         
         /* Do not charge THREAD for exception cycles */

kernel/generic/src/ipc/sysipc.c

@@ -1150 +1150 @@
                 return (unative_t) rc;
         
-        LOG("sys_ipc_connect_kbox(%" PRIu64 ")\n", taskid_arg.value);
+        LOG("sys_ipc_connect_kbox(%" PRIu64 ")", taskid_arg.value);
         
         return ipc_connect_kbox(taskid_arg.value);

kernel/generic/src/main/kinit.c

@@ -107 +107 @@
         if (config.cpu_count > 1) {
                 waitq_initialize(&ap_completion_wq);
+                
                 /*
                  * Create the kmp thread and wait for its completion.
@@ -124 +125 @@
                 thread_join(thread);
                 thread_detach(thread);
-        }
-        
-        if (config.cpu_count > 1) {
+                
+                /*
+                 * For each CPU, create its load balancing thread.
+                 */
                 size_t i;
                 
-                /*
-                 * For each CPU, create its load balancing thread.
-                 */
                 for (i = 0; i < config.cpu_count; i++) {
                         thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);

kernel/generic/src/mm/frame.c

@@ -1234 +1234 @@
 {
 #ifdef __32_BITS__
-        printf("[nr] [base addr ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
+        printf("[nr] [base addr] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
 
 #ifdef __64_BITS__
-        printf("[nr] [base address      ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
+        printf("[nr] [base address    ] [frames    ] [flags ] [free frames ] [busy frames ]\n");
 #endif
         
@@ -1274 +1274 @@
                 
 #ifdef __32_BITS__
-                printf("   %10p", base);
+                printf("  %10p", base);
 #endif
                 
 #ifdef __64_BITS__
-                printf("   %18p", base);
+                printf(" %18p", base);
 #endif
                 

kernel/generic/src/mm/tlb.c

@@ -73 +73 @@
  * to all other processors.
  *
- * @param type          Type describing scope of shootdown.
- * @param asid          Address space, if required by type.
- * @param page          Virtual page address, if required by type.
- * @param count         Number of pages, if required by type.
+ * @param type  Type describing scope of shootdown.
+ * @param asid  Address space, if required by type.
+ * @param page  Virtual page address, if required by type.
+ * @param count Number of pages, if required by type.
  *
  * @return The interrupt priority level as it existed prior to this call.
+ *
  */
 ipl_t tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid,
     uintptr_t page, size_t count)
 {
-        ipl_t ipl;
-
-        ipl = interrupts_disable();
+        ipl_t ipl = interrupts_disable();
         CPU->tlb_active = false;
         irq_spinlock_lock(&tlblock, false);
@@ -91 +90 @@
         size_t i;
         for (i = 0; i < config.cpu_count; i++) {
-                cpu_t *cpu;
-                
                 if (i == CPU->id)
                         continue;
                 
-                cpu = &cpus[i];
+                cpu_t *cpu = &cpus[i];
+                
                 irq_spinlock_lock(&cpu->lock, false);
                 if (cpu->tlb_messages_count == TLB_MESSAGE_QUEUE_LEN) {
@@ -124 +122 @@
         
 busy_wait:
-        for (i = 0; i < config.cpu_count; i++)
+        for (i = 0; i < config.cpu_count; i++) {
                 if (cpus[i].tlb_active)
                         goto busy_wait;
-
+        }
+        
         return ipl;
 }
@@ -133 +132 @@
 /** Finish TLB shootdown sequence.
  *
- * @param ipl           Previous interrupt priority level.
+ * @param ipl Previous interrupt priority level.
+ *
  */
 void tlb_shootdown_finalize(ipl_t ipl)

kernel/generic/src/proc/program.c

@@ -145 +145 @@
                 
                 program_loader = image_addr;
-                LOG("Registered program loader at 0x%" PRIp "\n",
+                LOG("Registered program loader at 0x%" PRIp,
                     image_addr);
                 

kernel/generic/src/smp/ipi.c

@@ -47 +47 @@
  * @param ipi Message to broadcast.
  *
- * @bug The decision whether to actually send the IPI must be based
- *      on a different criterion. The current version has
- *      problems when some of the detected CPUs are marked
- *      disabled in machine configuration.
  */
 void ipi_broadcast(int ipi)
@@ -60 +56 @@
          */
         
-        if ((config.cpu_active > 1) && (config.cpu_active == config.cpu_count))
+        if (config.cpu_count > 1)
                 ipi_broadcast_arch(ipi);
 }