Changeset 13 for tags/minix3.1.2a-orig

Timestamp:

Jun 4, 2011, 6:01:54 PM (13 years ago)

Author:

Mattia Monga

Message:

Server semaforo

Location:

tags/minix3.1.2a-orig/minix

Files:

• include/minix/com.h (modified) (2 diffs)
• kernel/table.c (modified) (4 diffs)
• servers/Makefile (modified) (2 diffs)
• servers/ss (added)
• servers/ss/Makefile (added)
• servers/ss/main.c (added)
• servers/ss/semaforo.c (added)
• servers/ss/semaforo.h (added)
• test/testsema.c (added)
• tools/Makefile (modified) (1 diff)

tags/minix3.1.2a-orig/minix/include/minix/com.h

@@ -42 +42 @@
 #define TTY_PROC_NR       5     /* terminal (TTY) driver */
 #define DS_PROC_NR        6     /* data store server */
-#define INIT_PROC_NR      7     /* init -- goes multiuser */
+#define SS_PROC_NR        7     /* semaphore server */
+#define INIT_PROC_NR      8     /* init -- goes multiuser */
 
 /* Number of processes contained in the system image. */
@@ -487 +488 @@
 
 /*===========================================================================*
+ *                Messages for the Semaphore Server                          *
+ *===========================================================================*/
+#define SS_RQ_BASE 0xA00  /* qualsiasi numero inutilizzato e` ok */
+#define SS_DOWN (SS_RQ_BASE + 0)        /* semaphore down */
+#define SS_UP   (SS_RQ_BASE + 1)        /* semaphore up */
+
+
+
+/*===========================================================================*
  *                Miscellaneous messages used by TTY                         *
  *===========================================================================*/

tags/minix3.1.2a-orig/minix/kernel/table.c

@@ -69 +69 @@
 #define SRV_M   (~0)
 #define SYS_M   (~0)
-#define USR_M (s(PM_PROC_NR) | s(FS_PROC_NR) | s(RS_PROC_NR) | s(SYSTEM))
+#define USR_M (s(PM_PROC_NR) | s(FS_PROC_NR) | s(RS_PROC_NR) | s(SS_PROC_NR) | s(SYSTEM))
 #define DRV_M (USR_M | s(SYSTEM) | s(CLOCK) | s(DS_PROC_NR) | s(LOG_PROC_NR) | s(TTY_PROC_NR))
 
@@ -80 +80 @@
 #define RS_C    ~0      
 #define DS_C    ~0      
+#define SS_C    ~0      
 #define PM_C    ~(c(SYS_DEVIO) | c(SYS_SDEVIO) | c(SYS_VDEVIO) | c(SYS_IRQCTL) | c(SYS_INT86))
 #define FS_C    (c(SYS_KILL) | c(SYS_VIRCOPY) | c(SYS_VIRVCOPY) | c(SYS_UMAP) | c(SYS_GETINFO) | c(SYS_EXIT) | c(SYS_TIMES) | c(SYS_SETALARM))
@@ -97 +98 @@
  * Note: the quantum size must be positive in all cases! 
  */
+/* Attenzione! Minix bug! L'ordine nella bootimage deve coincidere con quello 
+ * della tabella (vedi commento precedente). Ne deriva che tre file devono
+ * essere coerenti:
+ * 1. include/minix/com.h (l'ordine delle macro *_NR)
+ * 2. kernel/table.c      (l'ordine in boot_image)
+ * 3. tools/Makefile      (l'ordine di concatenamento nella boot image) 
+ * altrimenti la ipc_to mask non corrisponde
+ */
 PUBLIC struct boot_image image[] = {
 /* process nr,   pc, flags, qs,  queue, stack, traps, ipcto, call,  name */ 
@@ -106 +115 @@
  { FS_PROC_NR,    0, SRV_F, 32,      4, 0,     SRV_T, SRV_M,  FS_C, "fs"    },
  { RS_PROC_NR,    0, SRV_F,  4,      3, 0,     SRV_T, SYS_M,  RS_C, "rs"    },
+ { TTY_PROC_NR,   0, SRV_F,  4,      1, 0,     SRV_T, SYS_M, TTY_C, "tty"   },
  { DS_PROC_NR,    0, SRV_F,  4,      3, 0,     SRV_T, SYS_M,  DS_C, "ds"    },
- { TTY_PROC_NR,   0, SRV_F,  4,      1, 0,     SRV_T, SYS_M, TTY_C, "tty"   },
+ { SS_PROC_NR,    0, SRV_F,  4,      3, 0,     SRV_T, SYS_M,  SS_C, "ss"    },
  { MEM_PROC_NR,   0, SRV_F,  4,      2, 0,     SRV_T, SYS_M, MEM_C, "mem"   },
  { LOG_PROC_NR,   0, SRV_F,  4,      2, 0,     SRV_T, SYS_M, DRV_C, "log"   },

tags/minix3.1.2a-orig/minix/servers/Makefile

@@ -20 +20 @@
         cd ./rs && $(MAKE) $@
         cd ./ds && $(MAKE) $@
+        cd ./ss && $(MAKE) $@
         cd ./is && $(MAKE) $@
         cd ./init && $(MAKE) $@
@@ -29 +30 @@
         cd ./rs && $(MAKE) EXTRA_OPTS=$(EXTRA_OPTS) build
         cd ./ds && $(MAKE) EXTRA_OPTS=$(EXTRA_OPTS) build
+        cd ./ss && $(MAKE) EXTRA_OPTS=$(EXTRA_OPTS) build
         cd ./init && $(MAKE) EXTRA_OPTS=$(EXTRA_OPTS) build
 

tags/minix3.1.2a-orig/minix/tools/Makefile

@@ -11 +11 @@
         ../servers/fs/fs \
         ../servers/rs/rs \
+        ../drivers/tty/tty \
         ../servers/ds/ds \
-        ../drivers/tty/tty \
+        ../servers/ss/ss \
         ../drivers/memory/memory \
         ../drivers/log/log \