i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22896 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-11-11 13:00:59 +00:00
parent 1185d93240
commit 6edf637ba6
2 changed files with 65 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/Journal.cpp
+53 -46
View File
@@ -1,9 +1,10 @@
/* Journal - transaction and logging /*
* * Copyright 2001-2007, Axel Dörfler, [email protected].
* Copyright 2001-2005, Axel Dörfler, [email protected].
* This file may be used under the terms of the MIT License. * This file may be used under the terms of the MIT License.
*/ */
//! Transaction and logging
#include "Journal.h" #include "Journal.h"
#include "Inode.h" #include "Inode.h"
@@ -74,10 +75,11 @@ class LogEntry : public DoublyLinkedListLinkImpl<LogEntry> {
static void static void
add_to_iovec(iovec *vecs, int32 &index, int32 max, const void *address, size_t size) add_to_iovec(iovec *vecs, int32 &index, int32 max, const void *address,
size_t size)
{ {
if (index > 0 if (index > 0 && (addr_t)vecs[index - 1].iov_base
&& (addr_t)vecs[index - 1].iov_base + vecs[index - 1].iov_len == (addr_t)address) { + vecs[index - 1].iov_len == (addr_t)address) {
// the iovec can be combined with the previous one // the iovec can be combined with the previous one
vecs[index - 1].iov_len += size; vecs[index - 1].iov_len += size;
return; return;
@@ -143,7 +145,8 @@ RunArrays::_ContainsRun(block_run &run)
continue; continue;
if (run.Start() >= arrayRun.Start() if (run.Start() >= arrayRun.Start()
&& run.Start() + run.Length() <= arrayRun.Start() + arrayRun.Length()) && run.Start() + run.Length()
<= arrayRun.Start() + arrayRun.Length())
return true; return true;
} }
} }
@@ -152,11 +155,10 @@ RunArrays::_ContainsRun(block_run &run)
} }
/** Adds the specified block_run into the array. /*! Adds the specified block_run into the array.
* Note: it doesn't support overlapping - it must only be used Note: it doesn't support overlapping - it must only be used
* with block_runs of length 1! with block_runs of length 1!
*/ */
bool bool
RunArrays::_AddRun(block_run &run) RunArrays::_AddRun(block_run &run)
{ {
@@ -279,7 +281,8 @@ RunArrays::PrepareForWriting()
int32 blockSize = fJournal->GetVolume()->BlockSize(); int32 blockSize = fJournal->GetVolume()->BlockSize();
for (int32 i = 0; i < CountArrays(); i++) { for (int32 i = 0; i < CountArrays(); i++) {
ArrayAt(i)->max_runs = HOST_ENDIAN_TO_BFS_INT32(run_array::MaxRuns(blockSize)); ArrayAt(i)->max_runs = HOST_ENDIAN_TO_BFS_INT32(
run_array::MaxRuns(blockSize));
} }
} }
@@ -348,11 +351,10 @@ Journal::_CheckRunArray(const run_array *array)
} }
/** Replays an entry in the log. /*! Replays an entry in the log.
* \a _start points to the entry in the log, and will be bumped to the next \a _start points to the entry in the log, and will be bumped to the next
* one if replaying succeeded. one if replaying succeeded.
*/ */
status_t status_t
Journal::_ReplayRunArray(int32 *_start) Journal::_ReplayRunArray(int32 *_start)
{ {
@@ -365,7 +367,8 @@ Journal::_ReplayRunArray(int32 *_start)
CachedBlock cachedArray(fVolume); CachedBlock cachedArray(fVolume);
const run_array *array = (const run_array *)cachedArray.SetTo(logOffset + blockNumber); const run_array *array = (const run_array *)cachedArray.SetTo(logOffset
+ blockNumber);
if (array == NULL) if (array == NULL)
return B_IO_ERROR; return B_IO_ERROR;
@@ -377,8 +380,8 @@ Journal::_ReplayRunArray(int32 *_start)
CachedBlock cached(fVolume); CachedBlock cached(fVolume);
for (int32 index = 0; index < array->CountRuns(); index++) { for (int32 index = 0; index < array->CountRuns(); index++) {
const block_run &run = array->RunAt(index); const block_run &run = array->RunAt(index);
PRINT(("replay block run %lu:%u:%u in log at %Ld!\n", run.AllocationGroup(), PRINT(("replay block run %lu:%u:%u in log at %Ld!\n",
run.Start(), run.Length(), blockNumber)); run.AllocationGroup(), run.Start(), run.Length(), blockNumber));
off_t offset = fVolume->ToOffset(run); off_t offset = fVolume->ToOffset(run);
for (int32 i = 0; i < run.Length(); i++) { for (int32 i = 0; i < run.Length(); i++) {
@@ -401,13 +404,12 @@ Journal::_ReplayRunArray(int32 *_start)
} }
/** Replays all log entries - this will put the disk into a /*! Replays all log entries - this will put the disk into a
* consistent and clean state, if it was not correctly unmounted consistent and clean state, if it was not correctly unmounted
* before. before.
* This method is called by Journal::InitCheck() if the log start This method is called by Journal::InitCheck() if the log start
* and end pointer don't match. and end pointer don't match.
*/ */
status_t status_t
Journal::ReplayLog() Journal::ReplayLog()
{ {
@@ -443,12 +445,11 @@ Journal::ReplayLog()
} }
/** This is a callback function that is called by the cache, whenever /*! This is a callback function that is called by the cache, whenever
* a block is flushed to disk that was updated as part of a transaction. a block is flushed to disk that was updated as part of a transaction.
* This is necessary to keep track of completed transactions, to be This is necessary to keep track of completed transactions, to be
* able to update the log start pointer. able to update the log start pointer.
*/ */
void void
Journal::_blockNotify(int32 transactionID, void *arg) Journal::_blockNotify(int32 transactionID, void *arg)
{ {
@@ -470,7 +471,8 @@ Journal::_blockNotify(int32 transactionID, void *arg)
int32 length = next->Start() - logEntry->Start(); int32 length = next->Start() - logEntry->Start();
// log entries inbetween could have been already released, so // log entries inbetween could have been already released, so
// we can't just use LogEntry::Length() here // we can't just use LogEntry::Length() here
superBlock.log_start = (superBlock.log_start + length) % journal->fLogSize; superBlock.log_start = (superBlock.log_start + length)
% journal->fLogSize;
} else } else
superBlock.log_start = journal->fVolume->LogEnd(); superBlock.log_start = journal->fVolume->LogEnd();
@@ -521,8 +523,8 @@ Journal::_WriteTransactionToLog()
uint32 cookie = 0; uint32 cookie = 0;
off_t blockNumber; off_t blockNumber;
while (cache_next_block_in_transaction(fVolume->BlockCache(), fTransactionID, while (cache_next_block_in_transaction(fVolume->BlockCache(),
&cookie, &blockNumber, NULL, NULL) == B_OK) { fTransactionID, &cookie, &blockNumber, NULL, NULL) == B_OK) {
status = runArrays.Insert(blockNumber); status = runArrays.Insert(blockNumber);
if (status < B_OK) { if (status < B_OK) {
FATAL(("filling log entry failed!")); FATAL(("filling log entry failed!"));
@@ -592,10 +594,12 @@ Journal::_WriteTransactionToLog()
// make blocks available in the cache // make blocks available in the cache
const void *data; const void *data;
if (j == 0) { if (j == 0) {
data = block_cache_get_etc(fVolume->BlockCache(), blockNumber, data = block_cache_get_etc(fVolume->BlockCache(),
blockNumber, run.Length()); blockNumber, blockNumber, run.Length());
} else } else {
data = block_cache_get(fVolume->BlockCache(), blockNumber + j); data = block_cache_get(fVolume->BlockCache(),
blockNumber + j);
}
if (data == NULL) if (data == NULL)
return B_IO_ERROR; return B_IO_ERROR;
@@ -608,8 +612,8 @@ Journal::_WriteTransactionToLog()
// write back log entry // write back log entry
if (count > 0) { if (count > 0) {
logPosition = logStart + count; logPosition = logStart + count;
if (writev_pos(fVolume->Device(), logOffset + (logStart << blockShift), if (writev_pos(fVolume->Device(), logOffset
vecs, index) < 0) + (logStart << blockShift), vecs, index) < 0)
FATAL(("could not write log area: %s!\n", strerror(errno))); FATAL(("could not write log area: %s!\n", strerror(errno)));
} }
@@ -624,7 +628,8 @@ Journal::_WriteTransactionToLog()
} }
} }
LogEntry *logEntry = new LogEntry(this, fVolume->LogEnd(), runArrays.Length()); LogEntry *logEntry = new LogEntry(this, fVolume->LogEnd(),
runArrays.Length());
if (logEntry == NULL) { if (logEntry == NULL) {
FATAL(("no memory to allocate log entries!")); FATAL(("no memory to allocate log entries!"));
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -651,7 +656,8 @@ Journal::_WriteTransactionToLog()
fUsed += logEntry->Length(); fUsed += logEntry->Length();
fEntriesLock.Unlock(); fEntriesLock.Unlock();
cache_end_transaction(fVolume->BlockCache(), fTransactionID, _blockNotify, logEntry); cache_end_transaction(fVolume->BlockCache(), fTransactionID, _blockNotify,
logEntry);
// If the log goes to the next round (the log is written as a // If the log goes to the next round (the log is written as a
// circular buffer), all blocks will be flushed out which is // circular buffer), all blocks will be flushed out which is
@@ -754,7 +760,8 @@ Journal::Unlock(Transaction *owner, bool success)
uint32 uint32
Journal::_TransactionSize() const Journal::_TransactionSize() const
{ {
int32 count = cache_blocks_in_transaction(fVolume->BlockCache(), fTransactionID); int32 count = cache_blocks_in_transaction(fVolume->BlockCache(),
fTransactionID);
if (count < 0) if (count < 0)
return 0; return 0;
src/add-ons/kernel/file_systems/bfs/Journal.h
+12 -8
View File
@@ -1,6 +1,5 @@
/* Journal - transaction and logging /*
* * Copyright 2001-2007, Axel Dörfler, [email protected].
* Copyright 2001-2005, Axel Dörfler, [email protected].
* This file may be used under the terms of the MIT License. * This file may be used under the terms of the MIT License.
*/ */
#ifndef JOURNAL_H #ifndef JOURNAL_H
@@ -119,14 +118,16 @@ class Transaction {
status_t Start(Volume *volume, off_t refBlock); status_t Start(Volume *volume, off_t refBlock);
bool IsStarted() const { return fJournal != NULL; } bool IsStarted() const { return fJournal != NULL; }
void Done() void
Done()
{ {
if (fJournal != NULL) if (fJournal != NULL)
fJournal->Unlock(this, true); fJournal->Unlock(this, true);
fJournal = NULL; fJournal = NULL;
} }
bool HasParent() bool
HasParent()
{ {
if (fJournal != NULL) if (fJournal != NULL)
return fJournal->CurrentTransaction() == this; return fJournal->CurrentTransaction() == this;
@@ -134,7 +135,8 @@ class Transaction {
return false; return false;
} }
status_t WriteBlocks(off_t blockNumber, const uint8 *buffer, size_t numBlocks = 1) status_t
WriteBlocks(off_t blockNumber, const uint8 *buffer, size_t numBlocks = 1)
{ {
if (fJournal == NULL) if (fJournal == NULL)
return B_NO_INIT; return B_NO_INIT;
@@ -148,8 +150,10 @@ class Transaction {
return B_ERROR; return B_ERROR;
} }
Volume *GetVolume() { return fJournal != NULL ? fJournal->GetVolume() : NULL; } Volume *GetVolume()
int32 ID() const { return fJournal->TransactionID(); } { return fJournal != NULL ? fJournal->GetVolume() : NULL; }
int32 ID() const
{ return fJournal->TransactionID(); }
private: private:
Transaction(const Transaction &); Transaction(const Transaction &);