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
c32fd43b
Commit
c32fd43b
authored
May 22, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
into mysql.com:/home/kgeorge/mysql/5.0/B18745
parents
af3b08c5
48fe5a2d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
31 deletions
+39
-31
ndb/src/common/util/socket_io.cpp
ndb/src/common/util/socket_io.cpp
+39
-31
No files found.
ndb/src/common/util/socket_io.cpp
View file @
c32fd43b
...
...
@@ -53,6 +53,10 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis,
if
(
buflen
<=
1
)
return
0
;
int
sock_flags
=
fcntl
(
socket
,
F_GETFL
);
if
(
fcntl
(
socket
,
F_SETFL
,
sock_flags
|
O_NONBLOCK
)
==
-
1
)
return
-
1
;
fd_set
readset
;
FD_ZERO
(
&
readset
);
FD_SET
(
socket
,
&
readset
);
...
...
@@ -62,44 +66,48 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis,
timeout
.
tv_usec
=
(
timeout_millis
%
1000
)
*
1000
;
const
int
selectRes
=
select
(
socket
+
1
,
&
readset
,
0
,
0
,
&
timeout
);
if
(
selectRes
==
0
)
if
(
selectRes
==
0
)
{
return
0
;
}
if
(
selectRes
==
-
1
){
fcntl
(
socket
,
F_SETFL
,
sock_flags
);
return
-
1
;
}
int
pos
=
0
;
buf
[
pos
]
=
0
;
while
(
true
){
const
int
t
=
recv
(
socket
,
&
buf
[
pos
],
1
,
0
);
if
(
t
!=
1
){
buf
[
0
]
=
0
;
const
int
t
=
recv
(
socket
,
buf
,
buflen
,
MSG_PEEK
);
if
(
t
<
1
)
{
fcntl
(
socket
,
F_SETFL
,
sock_flags
);
return
-
1
;
}
if
(
buf
[
pos
]
==
'\n'
){
buf
[
pos
]
=
0
;
if
(
pos
>
0
&&
buf
[
pos
-
1
]
==
'\r'
){
pos
--
;
buf
[
pos
]
=
0
;
for
(
int
i
=
0
;
i
<
t
;
i
++
)
{
if
(
buf
[
i
]
==
'\n'
){
recv
(
socket
,
buf
,
i
+
1
,
0
);
buf
[
i
]
=
0
;
if
(
i
>
0
&&
buf
[
i
-
1
]
==
'\r'
){
i
--
;
buf
[
i
]
=
0
;
}
return
pos
;
fcntl
(
socket
,
F_SETFL
,
sock_flags
);
return
t
;
}
pos
++
;
if
(
pos
==
(
buflen
-
1
)){
buf
[
pos
]
=
0
;
return
buflen
;
}
FD_ZERO
(
&
readset
);
FD_SET
(
socket
,
&
readset
);
timeout
.
tv_sec
=
(
timeout_millis
/
1000
);
timeout
.
tv_usec
=
(
timeout_millis
%
1000
)
*
1000
;
const
int
selectRes
=
select
(
socket
+
1
,
&
readset
,
0
,
0
,
&
timeout
);
if
(
selectRes
!=
1
){
return
-
1
;
}
if
(
t
==
(
buflen
-
1
)){
recv
(
socket
,
buf
,
t
,
0
);
buf
[
t
]
=
0
;
fcntl
(
socket
,
F_SETFL
,
sock_flags
);
return
buflen
;
}
return
0
;
}
extern
"C"
...
...
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