Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
d817c1b7
Commit
d817c1b7
authored
8 years ago
by
Mario Emmenlauer
Committed by
Jan Tattermusch
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
iocp_windows.c and tcp_server_windows.c: fixes for gcc on Windows (unused variables and type casts)
parent
39fe75ee
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/core/lib/iomgr/iocp_windows.c
+0
-1
0 additions, 1 deletion
src/core/lib/iomgr/iocp_windows.c
src/core/lib/iomgr/tcp_server_windows.c
+4
-7
4 additions, 7 deletions
src/core/lib/iomgr/tcp_server_windows.c
with
4 additions
and
8 deletions
src/core/lib/iomgr/iocp_windows.c
+
0
−
1
View file @
d817c1b7
...
@@ -80,7 +80,6 @@ grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx *exec_ctx,
...
@@ -80,7 +80,6 @@ grpc_iocp_work_status grpc_iocp_work(grpc_exec_ctx *exec_ctx,
LPOVERLAPPED
overlapped
;
LPOVERLAPPED
overlapped
;
grpc_winsocket
*
socket
;
grpc_winsocket
*
socket
;
grpc_winsocket_callback_info
*
info
;
grpc_winsocket_callback_info
*
info
;
grpc_closure
*
closure
=
NULL
;
success
=
GetQueuedCompletionStatus
(
success
=
GetQueuedCompletionStatus
(
g_iocp
,
&
bytes
,
&
completion_key
,
&
overlapped
,
g_iocp
,
&
bytes
,
&
completion_key
,
&
overlapped
,
deadline_to_millis_timeout
(
deadline
,
gpr_now
(
deadline
.
clock_type
)));
deadline_to_millis_timeout
(
deadline
,
gpr_now
(
deadline
.
clock_type
)));
...
...
This diff is collapsed.
Click to expand it.
src/core/lib/iomgr/tcp_server_windows.c
+
4
−
7
View file @
d817c1b7
...
@@ -184,7 +184,6 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server *s,
...
@@ -184,7 +184,6 @@ void grpc_tcp_server_shutdown_starting_add(grpc_tcp_server *s,
}
}
static
void
tcp_server_destroy
(
grpc_exec_ctx
*
exec_ctx
,
grpc_tcp_server
*
s
)
{
static
void
tcp_server_destroy
(
grpc_exec_ctx
*
exec_ctx
,
grpc_tcp_server
*
s
)
{
int
immediately_done
=
0
;
grpc_tcp_listener
*
sp
;
grpc_tcp_listener
*
sp
;
gpr_mu_lock
(
&
s
->
mu
);
gpr_mu_lock
(
&
s
->
mu
);
...
@@ -240,7 +239,7 @@ static grpc_error *prepare_socket(SOCKET sock,
...
@@ -240,7 +239,7 @@ static grpc_error *prepare_socket(SOCKET sock,
error
=
GRPC_WSA_ERROR
(
WSAGetLastError
(),
"getsockname"
);
error
=
GRPC_WSA_ERROR
(
WSAGetLastError
(),
"getsockname"
);
goto
failure
;
goto
failure
;
}
}
sockname_temp
.
len
=
sockname_temp_len
;
sockname_temp
.
len
=
(
size_t
)
sockname_temp_len
;
*
port
=
grpc_sockaddr_get_port
(
&
sockname_temp
);
*
port
=
grpc_sockaddr_get_port
(
&
sockname_temp
);
return
GRPC_ERROR_NONE
;
return
GRPC_ERROR_NONE
;
...
@@ -248,8 +247,7 @@ static grpc_error *prepare_socket(SOCKET sock,
...
@@ -248,8 +247,7 @@ static grpc_error *prepare_socket(SOCKET sock,
failure:
failure:
GPR_ASSERT
(
error
!=
GRPC_ERROR_NONE
);
GPR_ASSERT
(
error
!=
GRPC_ERROR_NONE
);
char
*
tgtaddr
=
grpc_sockaddr_to_uri
(
addr
);
char
*
tgtaddr
=
grpc_sockaddr_to_uri
(
addr
);
grpc_error
*
final_error
=
grpc_error_set_int
(
grpc_error_set_int
(
grpc_error_set_str
(
GRPC_ERROR_CREATE_REFERENCING
(
grpc_error_set_str
(
GRPC_ERROR_CREATE_REFERENCING
(
"Failed to prepare server socket"
,
&
error
,
1
),
"Failed to prepare server socket"
,
&
error
,
1
),
GRPC_ERROR_STR_TARGET_ADDRESS
,
tgtaddr
),
GRPC_ERROR_STR_TARGET_ADDRESS
,
tgtaddr
),
GRPC_ERROR_INT_FD
,
(
intptr_t
)
sock
);
GRPC_ERROR_INT_FD
,
(
intptr_t
)
sock
);
...
@@ -261,7 +259,6 @@ failure:
...
@@ -261,7 +259,6 @@ failure:
static
void
decrement_active_ports_and_notify_locked
(
grpc_exec_ctx
*
exec_ctx
,
static
void
decrement_active_ports_and_notify_locked
(
grpc_exec_ctx
*
exec_ctx
,
grpc_tcp_listener
*
sp
)
{
grpc_tcp_listener
*
sp
)
{
int
notify
=
0
;
sp
->
shutting_down
=
0
;
sp
->
shutting_down
=
0
;
GPR_ASSERT
(
sp
->
server
->
active_ports
>
0
);
GPR_ASSERT
(
sp
->
server
->
active_ports
>
0
);
if
(
0
==
--
sp
->
server
->
active_ports
)
{
if
(
0
==
--
sp
->
server
->
active_ports
)
{
...
@@ -375,7 +372,7 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {
...
@@ -375,7 +372,7 @@ static void on_accept(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {
int
peer_name_len
=
(
int
)
peer_name
.
len
;
int
peer_name_len
=
(
int
)
peer_name
.
len
;
err
=
err
=
getpeername
(
sock
,
(
struct
sockaddr
*
)
peer_name
.
addr
,
&
peer_name_len
);
getpeername
(
sock
,
(
struct
sockaddr
*
)
peer_name
.
addr
,
&
peer_name_len
);
peer_name
.
len
=
peer_name_len
;
peer_name
.
len
=
(
size_t
)
peer_name_len
;
if
(
!
err
)
{
if
(
!
err
)
{
peer_name_string
=
grpc_sockaddr_to_uri
(
&
peer_name
);
peer_name_string
=
grpc_sockaddr_to_uri
(
&
peer_name
);
}
else
{
}
else
{
...
@@ -498,7 +495,7 @@ grpc_error *grpc_tcp_server_add_port(grpc_tcp_server *s,
...
@@ -498,7 +495,7 @@ grpc_error *grpc_tcp_server_add_port(grpc_tcp_server *s,
if
(
0
==
getsockname
(
sp
->
socket
->
socket
,
if
(
0
==
getsockname
(
sp
->
socket
->
socket
,
(
struct
sockaddr
*
)
sockname_temp
.
addr
,
(
struct
sockaddr
*
)
sockname_temp
.
addr
,
&
sockname_temp_len
))
{
&
sockname_temp_len
))
{
sockname_temp
.
len
=
sockname_temp_len
;
sockname_temp
.
len
=
(
size_t
)
sockname_temp_len
;
*
port
=
grpc_sockaddr_get_port
(
&
sockname_temp
);
*
port
=
grpc_sockaddr_get_port
(
&
sockname_temp
);
if
(
*
port
>
0
)
{
if
(
*
port
>
0
)
{
allocated_addr
=
gpr_malloc
(
sizeof
(
grpc_resolved_address
));
allocated_addr
=
gpr_malloc
(
sizeof
(
grpc_resolved_address
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment