Changes in uspace/app/init/init.c [d9fae235:2480e19] in mainline
- File:
-
- 1 edited
-
uspace/app/init/init.c (modified) (16 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/init/init.c
rd9fae235 r2480e19 46 46 #include <malloc.h> 47 47 #include <macros.h> 48 #include <str .h>48 #include <string.h> 49 49 #include <devmap.h> 50 #include <str_error.h>51 50 #include "init.h" 52 51 53 #define ROOT_DEVICE "bd/initrd"54 #define ROOT_MOUNT_POINT "/"55 56 #define DEVFS_FS_TYPE "devfs"57 52 #define DEVFS_MOUNT_POINT "/dev" 58 59 #define SCRATCH_FS_TYPE "tmpfs"60 #define SCRATCH_MOUNT_POINT "/scratch"61 62 #define DATA_FS_TYPE "fat"63 #define DATA_DEVICE "bd/disk0"64 #define DATA_MOUNT_POINT "/data"65 53 66 54 #define SRV_CONSOLE "/srv/console" … … 69 57 static void info_print(void) 70 58 { 71 printf("%s: HelenOS init\n", NAME); 72 } 73 74 static bool mount_report(const char *desc, const char *mntpt, 75 const char *fstype, const char *dev, int rc) 76 { 59 printf(NAME ": HelenOS init\n"); 60 } 61 62 static bool mount_root(const char *fstype) 63 { 64 char *opts = ""; 65 const char *root_dev = "bd/initrd"; 66 67 if (str_cmp(fstype, "tmpfs") == 0) 68 opts = "restore"; 69 70 int rc = mount(fstype, "/", root_dev, opts, IPC_FLAG_BLOCKING); 71 77 72 switch (rc) { 78 73 case EOK: 79 if (dev != NULL) 80 printf("%s: %s mounted on %s (%s at %s)\n", NAME, desc, mntpt, 81 fstype, dev); 82 else 83 printf("%s: %s mounted on %s (%s)\n", NAME, desc, mntpt, fstype); 74 printf(NAME ": Root filesystem mounted, %s at %s\n", 75 fstype, root_dev); 84 76 break; 85 77 case EBUSY: 86 printf( "%s: %s already mounted on %s\n", NAME, desc, mntpt);78 printf(NAME ": Root filesystem already mounted\n"); 87 79 return false; 88 80 case ELIMIT: 89 printf( "%s: %s limit exceeded\n", NAME, desc);81 printf(NAME ": Unable to mount root filesystem\n"); 90 82 return false; 91 83 case ENOENT: 92 printf( "%s: %s unknown type (%s)\n", NAME, desc, fstype);84 printf(NAME ": Unknown filesystem type (%s)\n", fstype); 93 85 return false; 94 86 default: 95 printf("%s: %s not mounted on %s (%s)\n", NAME, desc, mntpt, 96 str_error(rc)); 87 printf(NAME ": Error mounting root filesystem (%d)\n", rc); 97 88 return false; 98 89 } … … 101 92 } 102 93 103 static bool mount_root(const char *fstype)104 {105 const char *opts = "";106 107 if (str_cmp(fstype, "tmpfs") == 0)108 opts = "restore";109 110 int rc = mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,111 IPC_FLAG_BLOCKING);112 return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,113 ROOT_DEVICE, rc);114 }115 116 94 static bool mount_devfs(void) 117 95 { 118 int rc = mount(DEVFS_FS_TYPE, DEVFS_MOUNT_POINT, "", "", 119 IPC_FLAG_BLOCKING); 120 return mount_report("Device filesystem", DEVFS_MOUNT_POINT, DEVFS_FS_TYPE, 121 NULL, rc); 122 } 123 124 static void spawn(const char *fname) 125 { 126 const char *argv[2]; 96 int rc = mount("devfs", DEVFS_MOUNT_POINT, "", "", IPC_FLAG_BLOCKING); 97 98 switch (rc) { 99 case EOK: 100 printf(NAME ": Device filesystem mounted\n"); 101 break; 102 case EBUSY: 103 printf(NAME ": Device filesystem already mounted\n"); 104 105 return false; 106 case ELIMIT: 107 printf(NAME ": Unable to mount device filesystem\n"); 108 109 return false; 110 case ENOENT: 111 printf(NAME ": Unknown filesystem type (devfs)\n"); 112 113 return false; 114 default: 115 printf(NAME ": Error mounting device filesystem (%d)\n", rc); 116 117 return false; 118 } 119 120 return true; 121 } 122 123 static void spawn(char *fname) 124 { 125 char *argv[2]; 127 126 struct stat s; 128 127 … … 130 129 return; 131 130 132 printf( "%s: Spawning %s\n", NAME, fname);131 printf(NAME ": Spawning %s\n", fname); 133 132 134 133 argv[0] = fname; 135 134 argv[1] = NULL; 136 135 137 int err; 138 if (!task_spawn(fname, argv, &err)) 139 printf("%s: Error spawning %s (%s)\n", NAME, fname, 140 str_error(err)); 141 } 142 143 static void srv_start(const char *fname) 144 { 145 const char *argv[2]; 136 if (!task_spawn(fname, argv)) 137 printf(NAME ": Error spawning %s\n", fname); 138 } 139 140 static void srv_start(char *fname) 141 { 142 char *argv[2]; 146 143 task_id_t id; 147 144 task_exit_t texit; … … 152 149 return; 153 150 154 printf( "%s: Starting %s\n", NAME, fname);151 printf(NAME ": Starting %s\n", fname); 155 152 156 153 argv[0] = fname; 157 154 argv[1] = NULL; 158 155 159 id = task_spawn(fname, argv , &retval);156 id = task_spawn(fname, argv); 160 157 if (!id) { 161 printf("%s: Error spawning %s (%s)\n", NAME, fname, 162 str_error(retval)); 158 printf(NAME ": Error spawning %s\n", fname); 163 159 return; 164 160 } 165 161 166 162 rc = task_wait(id, &texit, &retval); 167 163 if (rc != EOK) { 168 printf("%s: Error waiting for %s (%s(\n", NAME, fname, 169 str_error(retval)); 164 printf(NAME ": Error waiting for %s\n", fname); 170 165 return; 171 166 } 172 167 173 168 if ((texit != TASK_EXIT_NORMAL) || (retval != 0)) { 174 printf( "%s: Server %s failed to start (%s)\n", NAME,175 fname, str_error(retval));176 } 177 } 178 179 static void console(c onst char *dev)180 { 181 c onst char *argv[3];169 printf(NAME ": Server %s failed to start (returned %d)\n", 170 fname, retval); 171 } 172 } 173 174 static void console(char *dev) 175 { 176 char *argv[3]; 182 177 char hid_in[DEVMAP_NAME_MAXLEN]; 183 178 int rc; … … 185 180 snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev); 186 181 187 printf( "%s: Spawning %s %s\n", NAME, SRV_CONSOLE, hid_in);182 printf(NAME ": Spawning %s with %s\n", SRV_CONSOLE, hid_in); 188 183 189 184 /* Wait for the input device to be ready */ … … 196 191 argv[2] = NULL; 197 192 198 if (!task_spawn(SRV_CONSOLE, argv, &rc)) 199 printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE, 200 hid_in, str_error(rc)); 193 if (!task_spawn(SRV_CONSOLE, argv)) 194 printf(NAME ": Error spawning %s with %s\n", SRV_CONSOLE, hid_in); 201 195 } else 202 printf("%s: Error waiting on %s (%s)\n", NAME, hid_in, 203 str_error(rc)); 204 } 205 206 static void getterm(const char *dev, const char *app) 207 { 208 const char *argv[4]; 196 printf(NAME ": Error waiting on %s\n", hid_in); 197 } 198 199 static void getterm(char *dev, char *app) 200 { 201 char *argv[4]; 209 202 char term[DEVMAP_NAME_MAXLEN]; 210 203 int rc; … … 212 205 snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev); 213 206 214 printf( "%s: Spawning %s %s %s\n", NAME, APP_GETTERM, term, app);207 printf(NAME ": Spawning %s with %s %s\n", APP_GETTERM, term, app); 215 208 216 209 /* Wait for the terminal device to be ready */ … … 224 217 argv[3] = NULL; 225 218 226 if (!task_spawn(APP_GETTERM, argv , &rc))227 printf( "%s: Error spawning %s %s %s (%s)\n", NAME, APP_GETTERM,228 term, app , str_error(rc));219 if (!task_spawn(APP_GETTERM, argv)) 220 printf(NAME ": Error spawning %s with %s %s\n", APP_GETTERM, 221 term, app); 229 222 } else 230 printf("%s: Error waiting on %s (%s)\n", NAME, term, 231 str_error(rc)); 232 } 233 234 static bool mount_scratch(void) 235 { 236 int rc = mount(SCRATCH_FS_TYPE, SCRATCH_MOUNT_POINT, "", "", 0); 237 return mount_report("Scratch filesystem", SCRATCH_MOUNT_POINT, 238 SCRATCH_FS_TYPE, NULL, rc); 239 } 240 241 static bool mount_data(void) 242 { 243 int rc = mount(DATA_FS_TYPE, DATA_MOUNT_POINT, DATA_DEVICE, "wtcache", 0); 244 return mount_report("Data filesystem", DATA_MOUNT_POINT, DATA_FS_TYPE, 245 DATA_DEVICE, rc); 223 printf(NAME ": Error waiting on %s\n", term); 224 } 225 226 static void mount_scratch(void) 227 { 228 int rc; 229 230 printf("Trying to mount null/0 on /scratch... "); 231 fflush(stdout); 232 233 rc = mount("tmpfs", "/scratch", "null/0", "", 0); 234 if (rc == EOK) 235 printf("OK\n"); 236 else 237 printf("Failed\n"); 238 } 239 240 static void mount_data(void) 241 { 242 int rc; 243 244 printf("Trying to mount bd/disk0 on /data... "); 245 fflush(stdout); 246 247 rc = mount("fat", "/data", "bd/disk0", "wtcache", 0); 248 if (rc == EOK) 249 printf("OK\n"); 250 else 251 printf("Failed\n"); 246 252 } 247 253 … … 251 257 252 258 if (!mount_root(STRING(RDFMT))) { 253 printf( "%s: Exiting\n", NAME);259 printf(NAME ": Exiting\n"); 254 260 return -1; 255 261 } 256 262 257 263 /* Make sure tmpfs is running. */ 258 264 if (str_cmp(STRING(RDFMT), "tmpfs") != 0) { … … 264 270 265 271 if (!mount_devfs()) { 266 printf( "%s: Exiting\n", NAME);272 printf(NAME ": Exiting\n"); 267 273 return -2; 268 274 } 269 275 270 276 mount_scratch(); 271 277 … … 276 282 srv_start("/srv/adb_ms"); 277 283 srv_start("/srv/char_ms"); 278 284 279 285 spawn("/srv/fb"); 280 286 spawn("/srv/kbd"); … … 282 288 283 289 spawn("/srv/clip"); 284 290 285 291 /* 286 292 * Start these synchronously so that mount_data() can be … … 293 299 (void) srv_start; 294 300 #endif 295 301 296 302 #ifdef CONFIG_MOUNT_DATA 297 303 mount_data(); … … 299 305 (void) mount_data; 300 306 #endif 301 307 302 308 getterm("term/vc0", "/app/bdsh"); 303 309 getterm("term/vc1", "/app/bdsh"); … … 307 313 getterm("term/vc5", "/app/bdsh"); 308 314 getterm("term/vc6", "/app/klog"); 315 getterm("term/vc7", "/srv/devman"); 316 317 //usleep(1000000); 318 //spawn("/srv/dd"); 319 309 320 310 321 return 0;
Note:
See TracChangeset
for help on using the changeset viewer.
