Commit 96b16e82 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 645de4fc
...@@ -39,7 +39,7 @@ static void* zfile_mmap_setup_read(VMA *vma, BigFile *file, blk_t blk, size_t bl ...@@ -39,7 +39,7 @@ static void* zfile_mmap_setup_read(VMA *vma, BigFile *file, blk_t blk, size_t bl
tie(mmap, err) = fileh->mmap(blk, blklen, vma); tie(mmap, err) = fileh->mmap(blk, blklen, vma);
if (err != nil) if (err != nil)
panic("TODO"); // XXX panic(v(err)); // XXX
return (void*)vma->addr_start; // XXX (?) kill - we set vma->addr_* return (void*)vma->addr_start; // XXX (?) kill - we set vma->addr_*
} }
......
...@@ -170,7 +170,7 @@ error _Conn::_pinner(context::Context ctx) { ...@@ -170,7 +170,7 @@ error _Conn::_pinner(context::Context ctx) {
error err = wconn.__pinner(ctx); error err = wconn.__pinner(ctx);
// if pinner fails, wcfs will kill us. // if pinner fails, wcfs will kill us.
// log pinner error so the error is not hidden. // log pinner error so that the error is not hidden.
// print to stderr as well as by default log does not print to there. // print to stderr as well as by default log does not print to there.
// XXX also catch panic/exc ? // XXX also catch panic/exc ?
if (!(err == nil || errors::Is(err, context::canceled))) { // canceled = .close asks pinner to stop if (!(err == nil || errors::Is(err, context::canceled))) { // canceled = .close asks pinner to stop
...@@ -242,6 +242,7 @@ error _Conn::__pin1(PinReq *req) { ...@@ -242,6 +242,7 @@ error _Conn::__pin1(PinReq *req) {
FileH f; FileH f;
bool ok; bool ok;
wconn._filehmu.lock(); wconn._filehmu.lock();
// XXX +incref f, so that simultaneous close does not remove f from wconn.filehTab ?
tie(f, ok) = wconn._filehtab.get_(req->foid); tie(f, ok) = wconn._filehtab.get_(req->foid);
if (!ok) { if (!ok) {
wconn._filehmu.unlock(); wconn._filehmu.unlock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment