summaryrefslogtreecommitdiff
path: root/vio/viosocket.c
diff options
context:
space:
mode:
authorunknown <wax@kishkin.ru>2004-12-23 16:04:40 +0500
committerunknown <wax@kishkin.ru>2004-12-23 16:04:40 +0500
commita627ffb9be6998793ab2cb005447d302c00c6651 (patch)
treed0a5713515293ae6045d3043f7f05aeafdad20c4 /vio/viosocket.c
parent615d31d0deb5c5078136741d26e5fb66baeac6a4 (diff)
downloadmariadb-git-a627ffb9be6998793ab2cb005447d302c00c6651.tar.gz
fix indentation
add space after comma add space after equal add comments in vio_close_shared_memory() include/violite.h: fix indentation sql-common/client.c: fix identation sql/mysqld.cc: add space after comma vio/vio.c: add space after equal fix identation vio/viosocket.c: add space after comma add comments in vio_close_shared_memory()
Diffstat (limited to 'vio/viosocket.c')
-rw-r--r--vio/viosocket.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c
index caf9451df7a..bcba05beef1 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -390,7 +390,7 @@ int vio_read_shared_memory(Vio * vio, gptr buf, int size)
WAIT_OBJECT_0+1 - event from vio->event_conn_closed. We can't read anything
WAIT_ABANDONED_0 and WAIT_TIMEOUT - fail. We can't read anything
*/
- if (WaitForMultipleObjects(2,(HANDLE*)&events,FALSE,
+ if (WaitForMultipleObjects(2, (HANDLE*)&events,FALSE,
vio->net->read_timeout*1000) != WAIT_OBJECT_0)
{
DBUG_RETURN(-1);
@@ -440,7 +440,8 @@ int vio_write_shared_memory(Vio * vio, const gptr buf, int size)
current_postion = buf;
while (remain != 0)
{
- if (WaitForSingleObject(vio->event_server_read,vio->net->write_timeout*1000) != WAIT_OBJECT_0)
+ if (WaitForSingleObject(vio->event_server_read, vio->net->write_timeout*1000)
+ != WAIT_OBJECT_0)
{
DBUG_RETURN(-1);
};
@@ -467,10 +468,18 @@ int vio_close_shared_memory(Vio * vio)
DBUG_ENTER("vio_close_shared_memory");
if (vio->type != VIO_CLOSED)
{
+ /*
+ Set event_conn_closed for notification of both client and server that
+ connection is closed
+ */
SetEvent(vio->event_conn_closed);
- r=UnmapViewOfFile(vio->handle_map) || CloseHandle(vio->event_server_wrote) ||
- CloseHandle(vio->event_server_read) || CloseHandle(vio->event_client_wrote) ||
- CloseHandle(vio->event_client_read) || CloseHandle(vio->handle_file_map);
+ /*
+ Close all handlers. UnmapViewOfFile and CloseHandle return non-zero
+ result if they are success.
+ */
+ r= UnmapViewOfFile(vio->handle_map) || CloseHandle(vio->event_server_wrote) ||
+ CloseHandle(vio->event_server_read) || CloseHandle(vio->event_client_wrote) ||
+ CloseHandle(vio->event_client_read) || CloseHandle(vio->handle_file_map);
if (!r)
{
DBUG_PRINT("vio_error", ("close() failed, error: %d",r));