Changeset e507afa in mainline for generic

Timestamp:

2005-11-14T19:39:26Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

abb79e84

Parents:

35667f8

Message:

For now, each architecture must use its own -O switch (-O2 doesn't work for ia64, -O3 doesn't work for mips32).

New mips32 atomic_add() function.

Cleanup.

Location:

generic

Files:

• include/arch.h (modified) (1 diff)
• include/config.h (modified) (1 diff)
• include/cpu.h (modified) (1 diff)
• include/proc/scheduler.h (modified) (2 diffs)
• include/synch/rwlock.h (modified) (1 diff)
• include/typedefs.h (modified) (1 diff)
• src/proc/scheduler.c (modified) (2 diffs)

generic/include/arch.h

@@ -53 +53 @@
  */
 struct the {
-        int preemption_disabled;        /**< Preemption disabled counter. */
+        count_t preemption_disabled;    /**< Preemption disabled counter. */
         thread_t *thread;               /**< Current thread. */
         task_t *task;                   /**< Current task. */

generic/include/config.h

@@ -36 +36 @@
 #define STACK_SIZE              PAGE_SIZE
 
-#define CONFIG_MEMORY_SIZE      8*1024*1024
-#define CONFIG_HEAP_SIZE        300*1024
+#define CONFIG_MEMORY_SIZE      (8*1024*1024)
+#define CONFIG_HEAP_SIZE        (300*1024)
 #define CONFIG_STACK_SIZE       STACK_SIZE
 

generic/include/cpu.h

@@ -46 +46 @@
         context_t saved_context;
 
-        volatile int nrdy;
+        volatile count_t nrdy;
         runq_t rq[RQ_COUNT];
-        volatile int needs_relink;
+        volatile count_t needs_relink;
 
         spinlock_t timeoutlock;

generic/include/proc/scheduler.h

@@ -39 +39 @@
 #define NEEDS_RELINK_MAX        (HZ)
 
+/** Scheduler run queue structure. */
 struct runq {
         spinlock_t lock;
         link_t rq_head;         /**< List of ready threads. */
-        int n;                  /**< Number of threads in rq_ready. */
+        count_t n;              /**< Number of threads in rq_ready. */
 };
 
@@ -52 +53 @@
 extern void kcpulb(void *arg);
 
+extern void before_thread_runs(void);
+
 /*
  * To be defined by architectures:
  */
  
-extern void before_thread_runs(void);
 extern void before_thread_runs_arch(void);
 

generic/include/synch/rwlock.h

@@ -44 +44 @@
         spinlock_t lock;
         mutex_t exclusive;      /**< Mutex for writers, readers can bypass it if readers_in is positive. */
-        int readers_in;         /**< Number of readers in critical section. */
+        count_t readers_in;     /**< Number of readers in critical section. */
 };
 

generic/include/typedefs.h

@@ -40 +40 @@
 
 typedef struct config config_t;
-typedef struct cpu_private_data cpu_private_data_t;
 typedef struct cpu_info cpu_info_t;
 

generic/src/proc/scheduler.c

@@ -51 +51 @@
 atomic_t nrdy;
 
-
 /** Take actions before new thread runs
  *
@@ -117 +116 @@
  *
  */
-static struct thread *find_best_thread(void)
+static thread_t *find_best_thread(void)
 {
         thread_t *t;