Changeset 761

Timestamp:

07/09/08 15:27:44 (5 months ago)

Author:

mwhitworth

Message:

Misc fixes and tidy up in headers.

Location:

Whitix/branches/fs/include

Files:

• fs/bcache.h (modified) (1 diff)
• fs/journal.h (modified) (8 diffs)
• i386/pit.h (modified) (1 diff)
• sched.h (modified) (1 diff)
• task.h (modified) (2 diffs)

Whitix/branches/fs/include/fs/bcache.h

@@ -25 +25 @@
 #define VFS_BCACHE_H
 
+#include <sdevice.h>
+#include <wait.h>
+
 /* Buffer flags. Bit index into buffer->flags. */
 #define BUFFER_DIRTY    0x0
 #define BUFFER_LOCKED   0x1
+#define BUFFER_JOURNAL  0x2
 
 /* Defines for dealing with flags. */
 #define BufferLocked(buffer) ((buffer)->flags & (1 << BUFFER_LOCKED))
 #define BufferDirty(buffer) ((buffer)->flags & (1 << BUFFER_DIRTY))
+#define BufferJournal(buffer) ((buffer)->flags & (1 << BUFFER_JOURNAL))
 
 /* Reference counting. Blocks are only freed if there are no references

Whitix/branches/fs/include/fs/journal.h

@@ -27 +27 @@
 #include <preempt.h>
 #include <task.h>
+#include <sched.h>
 #include <timer.h>
 #include <typedefs.h>
+#include <wait.h>
 
 /* In-memory structures. */
 
-#define JTRANS_RUNNING  1
+/* Types of list the head can be added to. */
+#define JOURN_RESERVED  1
+#define JOURN_METADATA  2
 
 struct JournalHead
 {
         struct Buffer* buffer;
+        struct JournalTrans* transaction;
+        int list;
+        struct ListHead next;
 };
+
+#define JTRANS_RUNNING  1
 
 struct JournalTrans
@@ -43 +52 @@
         struct Journal* journal;
         int state, transId, outstandingBlocks;
-        struct Timer* expireTimer;
+        DWORD expires;
         int updates, handleCount;
+
+        /* Lists */
+        struct ListHead reservedList;
+        struct ListHead metaDataList;
 };
 
@@ -50 +63 @@
 struct JournalHandle
 {
-        int refs, numBlocks;
+        int refs, numBlocks, sync;
         struct JournalTrans* transaction;
 };
+
+#define JOURN_COMMIT_INTERVAL   2 /* seconds */
 
 struct Journal
@@ -59 +74 @@
         int version;
         DWORD maxLength, sectorSize, maxTransactionBuffers;
-        DWORD transSequence;
-        struct JournalTrans* currTransaction;
+
+        /* Sequence numbers. */
+        DWORD transSequence, commitSequence, commitRequest;
+
+        /* Block management. */
+        DWORD head, free;
+
+        struct JournalTrans* currTransaction, *committingTrans;
+        struct Thread* commitThread;
+        WaitQueue commitWait, commitWaitDone;
+        int commitInterval;
 };
 
@@ -70 +94 @@
         DWORD blockType;
         DWORD sequence;
-};
+}PACKED;
 
+/* Block types. */
+#define JFS_DESC_BLOCK          1
 #define JFS_SUPERBLOCK_V1       3
 #define JFS_SUPERBLOCK_V2       4
@@ -84 +110 @@
         DWORD first;
 
-        /* TODO: Complete. */
+        DWORD sequence;
+        DWORD start;
+
+        DWORD errNo;
 };
 
@@ -92 +121 @@
 struct Journal* JournalCreate(struct VNode* vNode);
 struct JournalHandle* JournalStart(struct Journal* journal, int numBlocks);
+int JournalStop(struct JournalHandle* handle);
 struct JournalHead* JournalAddHeader(struct Buffer* buffer);
+struct JournalHead* JournalGetDescriptorBuffer(struct Journal* journal);
 
 /* transaction.c */
 int JournalGetWriteAccess(struct JournalHandle* handle, struct Buffer* buffer);
+int JournalDirtyMetadata(struct JournalHandle* handle, struct Buffer* buffer);
+int JournalForceCommit(struct Journal* journal);
+
+/* commit.c */
+int JournalStartCommit(struct Journal* journal, struct JournalTrans* trans);
+int JournalWaitCommit(struct Journal* journal, int id);
+int JournalCommitTransaction(struct Journal* journal);
+
+/* recovery.c */
+int JournalRecover(struct Journal* journal, struct JournalSuperBlock* jSb);
 
 /* Defines */
@@ -111 +152 @@
         PreemptEnable()
 
+#define JournHeadToBuffer(head) \
+        (head)->buffer
+
+#define BufferToJournHead(buffer) \
+        (buffer)->privData
+
 #endif

Whitix/branches/fs/include/i386/pit.h

@@ -33 +33 @@
 
 #define HZ 100
-#define CLOCK_TICK_RATE 1193182 /* The PIT's underlying HZ */
+#define CLOCK_TICK_RATE 1193180 /* The PIT's underlying HZ */
 #define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ)
 

Whitix/branches/fs/include/sched.h

@@ -41 +41 @@
 /* stackP is not applicable to kernel threads. */
 #define ThrCreateKernelThread(address) (ThrCreateThread(NULL,(DWORD)(address),false,0, NULL))
+#define ThrCreateKernelThreadArg(address, arg) (ThrCreateThread(NULL, (DWORD)(address), false, 0, (arg)))
 
 struct Thread* ThrCreateThread(struct Process* parent,DWORD entry,int user,DWORD stackP, void* argument);

Whitix/branches/fs/include/task.h

@@ -20 +20 @@
 #define TASK_H
 
-#include <fs/journal.h>
 #include <llist.h>
 #include <typedefs.h>
@@ -28 +27 @@
 
 struct Process;
+struct JournalHandle;
 
 #define THR_USED_MATH 1