nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix user-space filesystems not disconnecting properly.

This commit is contained in:
Jonas 'Sortie' Termansen 2014-05-06 19:12:44 +02:00
parent 0ebe5fc04d
commit 92d7c1807e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/fs/user.cpp
View File

@ -134,7 +134,7 @@ class ChannelNode : public AbstractInode
public: public:
ChannelNode(); ChannelNode();
ChannelNode(Channel* channel); ChannelNode(Channel* channel);
~ChannelNode(); virtual ~ChannelNode();
void Construct(Channel* channel); void Construct(Channel* channel);
virtual ssize_t read(ioctx_t* ctx, uint8_t* buf, size_t count); virtual ssize_t read(ioctx_t* ctx, uint8_t* buf, size_t count);
virtual ssize_t write(ioctx_t* ctx, const uint8_t* buf, size_t count); virtual ssize_t write(ioctx_t* ctx, const uint8_t* buf, size_t count);
@ -149,6 +149,7 @@ class Server : public Refcountable
public: public:
Server(); Server();
virtual ~Server(); virtual ~Server();
void Disconnect();
Channel* Connect(); Channel* Connect();
Channel* Listen(); Channel* Listen();
Ref<Inode> BootstrapNode(ino_t ino, mode_t type); Ref<Inode> BootstrapNode(ino_t ino, mode_t type);
@ -159,6 +160,7 @@ private:
kthread_cond_t connecting_cond; kthread_cond_t connecting_cond;
kthread_cond_t connectable_cond; kthread_cond_t connectable_cond;
Channel* connecting; Channel* connecting;
bool disconnected;
}; };
@ -274,7 +276,7 @@ size_t ChannelDirection::Send(ioctx_t* ctx, const void* ptr, size_t least, size_
while ( true ) while ( true )
{ {
if ( !still_reading ) if ( !still_reading )
return errno = EPIPE, sofar; return errno = ECONNRESET, sofar;
if ( buffer_used < BUFFER_SIZE ) if ( buffer_used < BUFFER_SIZE )
break; break;
if ( least <= sofar ) if ( least <= sofar )
@ -316,7 +318,7 @@ size_t ChannelDirection::Recv(ioctx_t* ctx, void* ptr, size_t least, size_t max)
if ( least <= sofar ) if ( least <= sofar )
return sofar; return sofar;
if ( !still_writing ) if ( !still_writing )
return errno = EPIPE, sofar; return errno = ECONNRESET, sofar;
if ( !kthread_cond_wait_signal(&not_empty, &transfer_lock) ) if ( !kthread_cond_wait_signal(&not_empty, &transfer_lock) )
return errno = EINTR, sofar; return errno = EINTR, sofar;
} }
@ -483,24 +485,34 @@ Server::Server()
connecting_cond = KTHREAD_COND_INITIALIZER; connecting_cond = KTHREAD_COND_INITIALIZER;
connectable_cond = KTHREAD_COND_INITIALIZER; connectable_cond = KTHREAD_COND_INITIALIZER;
connecting = NULL; connecting = NULL;
disconnected = false;
} }
Server::~Server() Server::~Server()
{ {
} }
void Server::Disconnect()
{
ScopedLock lock(&connect_lock);
disconnected = true;
kthread_cond_signal(&connectable_cond);
}
Channel* Server::Connect() Channel* Server::Connect()
{ {
Channel* channel = new Channel(); Channel* channel = new Channel();
if ( !channel ) if ( !channel )
return NULL; return NULL;
ScopedLock lock(&connect_lock); ScopedLock lock(&connect_lock);
while ( connecting ) while ( !disconnected && connecting )
if ( !kthread_cond_wait_signal(&connectable_cond, &connect_lock) ) if ( !kthread_cond_wait_signal(&connectable_cond, &connect_lock) )
{ {
delete channel; delete channel;
return errno = EINTR, (Channel*) NULL; return errno = EINTR, (Channel*) NULL;
} }
if ( disconnected )
return delete channel, errno = ECONNREFUSED, (Channel*) NULL;
connecting = channel; connecting = channel;
kthread_cond_signal(&connecting_cond); kthread_cond_signal(&connecting_cond);
return channel; return channel;
@ -544,6 +556,7 @@ ServerNode::ServerNode(Ref<Server> server)
ServerNode::~ServerNode() ServerNode::~ServerNode()
{ {
server->Disconnect();
} }
Ref<Inode> ServerNode::open(ioctx_t* /*ctx*/, const char* filename, int flags, Ref<Inode> ServerNode::open(ioctx_t* /*ctx*/, const char* filename, int flags,