From: John Hodge Date: Tue, 5 Oct 2010 07:06:47 +0000 (+0800) Subject: Changed back to lottery scheduler, disabled debug X-Git-Tag: rel0.06~15 X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Facess2.git;a=commitdiff_plain;h=3662ceff5d51ba5a3c31796da73f8f5568f68209 Changed back to lottery scheduler, disabled debug - Fixed behavior in Unix to ACL code --- diff --git a/Kernel/binary.c b/Kernel/binary.c index dffb1784..aa5d9547 100644 --- a/Kernel/binary.c +++ b/Kernel/binary.c @@ -2,7 +2,7 @@ * Acess2 * Common Binary Loader */ -#define DEBUG 1 +#define DEBUG 0 #include #include #include diff --git a/Kernel/threads.c b/Kernel/threads.c index feae49a0..325fa74e 100644 --- a/Kernel/threads.c +++ b/Kernel/threads.c @@ -17,7 +17,7 @@ #define SCHED_RR_SIM 2 // Single Queue Round Robin #define SCHED_RR_PRI 3 // Multi Queue Round Robin // Set scheduler type -#define SCHEDULER_TYPE SCHED_RR_PRI +#define SCHEDULER_TYPE SCHED_LOTTERY // === CONSTANTS === #define DEFAULT_QUANTUM 10 diff --git a/Kernel/vfs/acls.c b/Kernel/vfs/acls.c index 1c1b6cfe..ab88b985 100644 --- a/Kernel/vfs/acls.c +++ b/Kernel/vfs/acls.c @@ -138,7 +138,7 @@ tVFS_ACL *VFS_UnixToAcessACL(Uint Mode, Uint Owner, Uint Group) if(Mode & 0010) ret[1].Perms |= VFS_PERM_EXECUTE; // Global - ret[2].Group = 1; ret[2].ID = Group; + ret[2].Group = 1; ret[2].ID = -1; ret[2].Inv = 0; ret[2].Perms = 0; if(Mode & 0004) ret[2].Perms |= VFS_PERM_READ; if(Mode & 0002) ret[2].Perms |= VFS_PERM_WRITE; diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c index cc546f48..40c1d39b 100644 --- a/Kernel/vfs/open.c +++ b/Kernel/vfs/open.c @@ -2,7 +2,7 @@ * AcessMicro VFS * - Open, Close and ChDir */ -#define DEBUG 1 +#define DEBUG 0 #include #include #include "vfs.h" diff --git a/Modules/Filesystems/FAT/fat.c b/Modules/Filesystems/FAT/fat.c index a63bac01..a88ffb5f 100644 --- a/Modules/Filesystems/FAT/fat.c +++ b/Modules/Filesystems/FAT/fat.c @@ -17,7 +17,7 @@ * \todo Implement changing of the parent directory when a file is written to * \todo Implement file creation / deletion */ -#define DEBUG 1 +#define DEBUG 0 #define VERBOSE 1 #define CACHE_FAT 0 //!< Caches the FAT in memory