2e59046362
usertest for big write()s push begin_trans/commit_trans down into syscalls
188 lines
4.6 KiB
C
188 lines
4.6 KiB
C
#include "types.h"
|
|
#include "defs.h"
|
|
#include "param.h"
|
|
#include "mmu.h"
|
|
#include "proc.h"
|
|
#include "x86.h"
|
|
#include "spinlock.h"
|
|
#include "fs.h"
|
|
#include "buf.h"
|
|
|
|
// Simple logging. Each system call that might write the file system
|
|
// should be surrounded with begin_trans() and commit_trans() calls.
|
|
//
|
|
// The log holds at most one transaction at a time. Commit forces
|
|
// the log (with commit record) to disk, then installs the affected
|
|
// blocks to disk, then erases the log. begin_trans() ensures that
|
|
// only one system call can be in a transaction; others must wait.
|
|
//
|
|
// Allowing only one transaction at a time means that the file
|
|
// system code doesn't have to worry about the possibility of
|
|
// one transaction reading a block that another one has modified,
|
|
// for example an i-node block.
|
|
//
|
|
// Read-only system calls don't need to use transactions, though
|
|
// this means that they may observe uncommitted data. I-node
|
|
// and buffer locks prevent read-only calls from seeing inconsistent data.
|
|
//
|
|
// The log is a physical re-do log containing disk blocks.
|
|
// The on-disk log format:
|
|
// header block, containing sector #s for block A, B, C, ...
|
|
// block A
|
|
// block B
|
|
// block C
|
|
// ...
|
|
// Log appends are synchronous.
|
|
|
|
// Contents of the header block, used for both the on-disk header block
|
|
// and to keep track in memory of logged sector #s before commit.
|
|
struct logheader {
|
|
int n;
|
|
int sector[LOGSIZE];
|
|
};
|
|
|
|
struct {
|
|
struct spinlock lock;
|
|
int start;
|
|
int size;
|
|
int intrans;
|
|
int dev;
|
|
struct logheader lh;
|
|
} log;
|
|
|
|
static void recover_from_log(void);
|
|
|
|
void
|
|
initlog(void)
|
|
{
|
|
if (sizeof(struct logheader) >= BSIZE)
|
|
panic("initlog: too big logheader");
|
|
|
|
struct superblock sb;
|
|
initlock(&log.lock, "log");
|
|
readsb(ROOTDEV, &sb);
|
|
log.start = sb.size - sb.nlog;
|
|
log.size = sb.nlog;
|
|
log.dev = ROOTDEV;
|
|
recover_from_log();
|
|
}
|
|
|
|
// Copy committed blocks from log to their home location
|
|
static void
|
|
install_trans(void)
|
|
{
|
|
int tail;
|
|
|
|
//if (log.lh.n > 0)
|
|
// cprintf("install_trans %d\n", log.lh.n);
|
|
for (tail = 0; tail < log.lh.n; tail++) {
|
|
// cprintf("put entry %d to disk block %d\n", tail, log.lh.sector[tail]);
|
|
struct buf *lbuf = bread(log.dev, log.start+tail+1); // read i'th block from log
|
|
struct buf *dbuf = bread(log.dev, log.lh.sector[tail]); // read dst block
|
|
memmove(dbuf->data, lbuf->data, BSIZE);
|
|
bwrite(dbuf);
|
|
brelse(lbuf);
|
|
brelse(dbuf);
|
|
}
|
|
}
|
|
|
|
// Read the log header from disk into the in-memory log header
|
|
static void
|
|
read_head(void)
|
|
{
|
|
struct buf *buf = bread(log.dev, log.start);
|
|
struct logheader *lh = (struct logheader *) (buf->data);
|
|
int i;
|
|
log.lh.n = lh->n;
|
|
for (i = 0; i < log.lh.n; i++) {
|
|
log.lh.sector[i] = lh->sector[i];
|
|
}
|
|
brelse(buf);
|
|
//if (log.lh.n > 0)
|
|
// cprintf("read_head: %d\n", log.lh.n);
|
|
}
|
|
|
|
// Write the in-memory log header to disk, committing log entries till head
|
|
static void
|
|
write_head(void)
|
|
{
|
|
// if (log.lh.n > 0)
|
|
// cprintf("write_head: %d\n", log.lh.n);
|
|
|
|
struct buf *buf = bread(log.dev, log.start);
|
|
struct logheader *hb = (struct logheader *) (buf->data);
|
|
int i;
|
|
hb->n = log.lh.n;
|
|
for (i = 0; i < log.lh.n; i++) {
|
|
hb->sector[i] = log.lh.sector[i];
|
|
}
|
|
bwrite(buf);
|
|
brelse(buf);
|
|
}
|
|
|
|
static void
|
|
recover_from_log(void)
|
|
{
|
|
read_head();
|
|
install_trans(); // Install all transactions till head
|
|
log.lh.n = 0;
|
|
write_head(); // Reclaim log
|
|
}
|
|
|
|
void
|
|
begin_trans(void)
|
|
{
|
|
acquire(&log.lock);
|
|
while (log.intrans) {
|
|
sleep(&log, &log.lock);
|
|
}
|
|
log.intrans = 1;
|
|
release(&log.lock);
|
|
}
|
|
|
|
void
|
|
commit_trans(void)
|
|
{
|
|
write_head(); // This causes all blocks till log.head to be commited
|
|
install_trans(); // Install all the transactions till head
|
|
log.lh.n = 0;
|
|
write_head(); // Reclaim log
|
|
|
|
acquire(&log.lock);
|
|
log.intrans = 0;
|
|
wakeup(&log);
|
|
release(&log.lock);
|
|
}
|
|
|
|
// Caller has modified b->data and is done with the buffer.
|
|
// Append the block to the log and record the block number,
|
|
// but don't write the log header (which would commit the write).
|
|
// log_write() replaces bwrite(); a typical use is:
|
|
// bp = bread(...)
|
|
// modify bp->data[]
|
|
// log_write(bp)
|
|
// brelse(bp)
|
|
void
|
|
log_write(struct buf *b)
|
|
{
|
|
int i;
|
|
|
|
if (log.lh.n >= LOGSIZE || log.lh.n >= log.size - 1)
|
|
panic("too big a transaction");
|
|
if (!log.intrans)
|
|
panic("write outside of trans");
|
|
|
|
// cprintf("log_write: %d %d\n", b->sector, log.lh.n);
|
|
|
|
for (i = 0; i < log.lh.n; i++) {
|
|
if (log.lh.sector[i] == b->sector) // log absorbtion?
|
|
break;
|
|
}
|
|
log.lh.sector[i] = b->sector;
|
|
struct buf *lbuf = bread(b->dev, log.start+i+1);
|
|
memmove(lbuf->data, b->data, BSIZE);
|
|
bwrite(lbuf);
|
|
brelse(lbuf);
|
|
if (i == log.lh.n)
|
|
log.lh.n++;
|
|
}
|