Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
c02308a7
Commit
c02308a7
authored
Sep 08, 2006
by
cmiller@zippy.cornsilk.net
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix initialized memory. Count the number of failures in shm-closing
functions and return it.
parent
f6f7eb85
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
2 deletions
+27
-2
vio/viosocket.c
vio/viosocket.c
+27
-2
No files found.
vio/viosocket.c
View file @
c02308a7
...
@@ -545,9 +545,13 @@ int vio_write_shared_memory(Vio * vio, const gptr buf, int size)
...
@@ -545,9 +545,13 @@ int vio_write_shared_memory(Vio * vio, const gptr buf, int size)
}
}
/**
Close shared memory and DBUG_PRINT any errors that happen on closing.
@return Zero if all closing functions succeed, and nonzero otherwise.
*/
int
vio_close_shared_memory
(
Vio
*
vio
)
int
vio_close_shared_memory
(
Vio
*
vio
)
{
{
int
r
;
int
error_count
=
0
;
DBUG_ENTER
(
"vio_close_shared_memory"
);
DBUG_ENTER
(
"vio_close_shared_memory"
);
if
(
vio
->
type
!=
VIO_CLOSED
)
if
(
vio
->
type
!=
VIO_CLOSED
)
{
{
...
@@ -561,23 +565,44 @@ int vio_close_shared_memory(Vio * vio)
...
@@ -561,23 +565,44 @@ int vio_close_shared_memory(Vio * vio)
result if they are success.
result if they are success.
*/
*/
if
(
UnmapViewOfFile
(
vio
->
handle_map
)
==
0
)
if
(
UnmapViewOfFile
(
vio
->
handle_map
)
==
0
)
{
error_count
++
;
DBUG_PRINT
(
"vio_error"
,
(
"UnmapViewOfFile() failed"
));
DBUG_PRINT
(
"vio_error"
,
(
"UnmapViewOfFile() failed"
));
}
if
(
CloseHandle
(
vio
->
event_server_wrote
)
==
0
)
if
(
CloseHandle
(
vio
->
event_server_wrote
)
==
0
)
{
error_count
++
;
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->esw) failed"
));
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->esw) failed"
));
}
if
(
CloseHandle
(
vio
->
event_server_read
)
==
0
)
if
(
CloseHandle
(
vio
->
event_server_read
)
==
0
)
{
error_count
++
;
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->esr) failed"
));
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->esr) failed"
));
}
if
(
CloseHandle
(
vio
->
event_client_wrote
)
==
0
)
if
(
CloseHandle
(
vio
->
event_client_wrote
)
==
0
)
{
error_count
++
;
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->ecw) failed"
));
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->ecw) failed"
));
}
if
(
CloseHandle
(
vio
->
event_client_read
)
==
0
)
if
(
CloseHandle
(
vio
->
event_client_read
)
==
0
)
{
error_count
++
;
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->ecr) failed"
));
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->ecr) failed"
));
}
if
(
CloseHandle
(
vio
->
handle_file_map
)
==
0
)
if
(
CloseHandle
(
vio
->
handle_file_map
)
==
0
)
{
error_count
++
;
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->hfm) failed"
));
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->hfm) failed"
));
}
if
(
CloseHandle
(
vio
->
event_conn_closed
)
==
0
)
if
(
CloseHandle
(
vio
->
event_conn_closed
)
==
0
)
{
error_count
++
;
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->ecc) failed"
));
DBUG_PRINT
(
"vio_error"
,
(
"CloseHandle(vio->ecc) failed"
));
}
}
}
vio
->
type
=
VIO_CLOSED
;
vio
->
type
=
VIO_CLOSED
;
vio
->
sd
=
-
1
;
vio
->
sd
=
-
1
;
DBUG_RETURN
(
!
r
);
DBUG_RETURN
(
error_count
);
}
}
#endif
/* HAVE_SMEM */
#endif
/* HAVE_SMEM */
#endif
/* __WIN__ */
#endif
/* __WIN__ */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment