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
1855710c
Commit
1855710c
authored
8 years ago
by
Muxi Yan
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #10210 from muxi/enable-cronet-compression
Enable cronet compression
parents
8e2713ec
12b44ae5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/core/ext/transport/cronet/transport/cronet_transport.c
+45
-20
45 additions, 20 deletions
src/core/ext/transport/cronet/transport/cronet_transport.c
src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m
+1
-2
1 addition, 2 deletions
...e-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m
with
46 additions
and
22 deletions
src/core/ext/transport/cronet/transport/cronet_transport.c
+
45
−
20
View file @
1855710c
...
@@ -128,6 +128,7 @@ struct read_state {
...
@@ -128,6 +128,7 @@ struct read_state {
int
received_bytes
;
int
received_bytes
;
int
remaining_bytes
;
int
remaining_bytes
;
int
length_field
;
int
length_field
;
bool
compressed
;
char
grpc_header_bytes
[
GRPC_HEADER_SIZE_IN_BYTES
];
char
grpc_header_bytes
[
GRPC_HEADER_SIZE_IN_BYTES
];
char
*
payload_field
;
char
*
payload_field
;
bool
read_stream_closed
;
bool
read_stream_closed
;
...
@@ -484,6 +485,16 @@ static void on_response_headers_received(
...
@@ -484,6 +485,16 @@ static void on_response_headers_received(
CRONET_LOG
(
GPR_DEBUG
,
"R: on_response_headers_received(%p, %p, %s)"
,
stream
,
CRONET_LOG
(
GPR_DEBUG
,
"R: on_response_headers_received(%p, %p, %s)"
,
stream
,
headers
,
negotiated_protocol
);
headers
,
negotiated_protocol
);
stream_obj
*
s
=
(
stream_obj
*
)
stream
->
annotation
;
stream_obj
*
s
=
(
stream_obj
*
)
stream
->
annotation
;
/* Identify if this is a header or a trailer (in a trailer-only response case)
*/
for
(
size_t
i
=
0
;
i
<
headers
->
count
;
i
++
)
{
if
(
0
==
strcmp
(
"grpc-status"
,
headers
->
headers
[
i
].
key
))
{
on_response_trailers_received
(
stream
,
headers
);
return
;
}
}
gpr_mu_lock
(
&
s
->
mu
);
gpr_mu_lock
(
&
s
->
mu
);
memset
(
&
s
->
state
.
rs
.
initial_metadata
,
0
,
memset
(
&
s
->
state
.
rs
.
initial_metadata
,
0
,
sizeof
(
s
->
state
.
rs
.
initial_metadata
));
sizeof
(
s
->
state
.
rs
.
initial_metadata
));
...
@@ -507,6 +518,7 @@ static void on_response_headers_received(
...
@@ -507,6 +518,7 @@ static void on_response_headers_received(
is closed */
is closed */
GPR_ASSERT
(
s
->
state
.
rs
.
length_field_received
==
false
);
GPR_ASSERT
(
s
->
state
.
rs
.
length_field_received
==
false
);
s
->
state
.
rs
.
read_buffer
=
s
->
state
.
rs
.
grpc_header_bytes
;
s
->
state
.
rs
.
read_buffer
=
s
->
state
.
rs
.
grpc_header_bytes
;
s
->
state
.
rs
.
compressed
=
false
;
s
->
state
.
rs
.
received_bytes
=
0
;
s
->
state
.
rs
.
received_bytes
=
0
;
s
->
state
.
rs
.
remaining_bytes
=
GRPC_HEADER_SIZE_IN_BYTES
;
s
->
state
.
rs
.
remaining_bytes
=
GRPC_HEADER_SIZE_IN_BYTES
;
CRONET_LOG
(
GPR_DEBUG
,
"bidirectional_stream_read(%p)"
,
s
->
cbs
);
CRONET_LOG
(
GPR_DEBUG
,
"bidirectional_stream_read(%p)"
,
s
->
cbs
);
...
@@ -641,7 +653,7 @@ static void on_response_trailers_received(
...
@@ -641,7 +653,7 @@ static void on_response_trailers_received(
*/
*/
static
void
create_grpc_frame
(
grpc_slice_buffer
*
write_slice_buffer
,
static
void
create_grpc_frame
(
grpc_slice_buffer
*
write_slice_buffer
,
char
**
pp_write_buffer
,
char
**
pp_write_buffer
,
size_t
*
p_write_buffer_size
)
{
size_t
*
p_write_buffer_size
,
uint32_t
flags
)
{
grpc_slice
slice
=
grpc_slice_buffer_take_first
(
write_slice_buffer
);
grpc_slice
slice
=
grpc_slice_buffer_take_first
(
write_slice_buffer
);
size_t
length
=
GRPC_SLICE_LENGTH
(
slice
);
size_t
length
=
GRPC_SLICE_LENGTH
(
slice
);
*
p_write_buffer_size
=
length
+
GRPC_HEADER_SIZE_IN_BYTES
;
*
p_write_buffer_size
=
length
+
GRPC_HEADER_SIZE_IN_BYTES
;
...
@@ -650,7 +662,9 @@ static void create_grpc_frame(grpc_slice_buffer *write_slice_buffer,
...
@@ -650,7 +662,9 @@ static void create_grpc_frame(grpc_slice_buffer *write_slice_buffer,
*
pp_write_buffer
=
write_buffer
;
*
pp_write_buffer
=
write_buffer
;
uint8_t
*
p
=
(
uint8_t
*
)
write_buffer
;
uint8_t
*
p
=
(
uint8_t
*
)
write_buffer
;
/* Append 5 byte header */
/* Append 5 byte header */
*
p
++
=
0
;
/* Compressed flag */
*
p
++
=
(
flags
&
GRPC_WRITE_INTERNAL_COMPRESS
)
?
1
:
0
;
/* Message length */
*
p
++
=
(
uint8_t
)(
length
>>
24
);
*
p
++
=
(
uint8_t
)(
length
>>
24
);
*
p
++
=
(
uint8_t
)(
length
>>
16
);
*
p
++
=
(
uint8_t
)(
length
>>
16
);
*
p
++
=
(
uint8_t
)(
length
>>
8
);
*
p
++
=
(
uint8_t
)(
length
>>
8
);
...
@@ -728,14 +742,16 @@ static void convert_metadata_to_cronet_headers(
...
@@ -728,14 +742,16 @@ static void convert_metadata_to_cronet_headers(
*
p_num_headers
=
(
size_t
)
num_headers
;
*
p_num_headers
=
(
size_t
)
num_headers
;
}
}
static
int
parse_grpc_header
(
const
uint8_t
*
data
)
{
static
void
parse_grpc_header
(
const
uint8_t
*
data
,
int
*
length
,
bool
*
compressed
)
{
const
uint8_t
c
=
*
data
;
const
uint8_t
*
p
=
data
+
1
;
const
uint8_t
*
p
=
data
+
1
;
int
length
=
0
;
*
compressed
=
((
c
&
0x01
)
==
0x01
)
;
length
|
=
((
uint8_t
)
*
p
++
)
<<
24
;
*
length
=
0
;
length
|=
((
uint8_t
)
*
p
++
)
<<
16
;
*
length
|=
((
uint8_t
)
*
p
++
)
<<
24
;
length
|=
((
uint8_t
)
*
p
++
)
<<
8
;
*
length
|=
((
uint8_t
)
*
p
++
)
<<
16
;
length
|=
((
uint8_t
)
*
p
++
);
*
length
|=
((
uint8_t
)
*
p
++
)
<<
8
;
return
length
;
*
length
|=
((
uint8_t
)
*
p
++
)
;
}
}
static
bool
header_has_authority
(
grpc_linked_mdelem
*
head
)
{
static
bool
header_has_authority
(
grpc_linked_mdelem
*
head
)
{
...
@@ -788,7 +804,8 @@ static bool op_can_be_run(grpc_transport_stream_op *curr_op,
...
@@ -788,7 +804,8 @@ static bool op_can_be_run(grpc_transport_stream_op *curr_op,
else
if
(
!
stream_state
->
state_callback_received
[
OP_SEND_INITIAL_METADATA
])
else
if
(
!
stream_state
->
state_callback_received
[
OP_SEND_INITIAL_METADATA
])
result
=
false
;
result
=
false
;
/* we haven't received headers yet. */
/* we haven't received headers yet. */
else
if
(
!
stream_state
->
state_callback_received
[
OP_RECV_INITIAL_METADATA
])
else
if
(
!
stream_state
->
state_callback_received
[
OP_RECV_INITIAL_METADATA
]
&&
!
stream_state
->
state_op_done
[
OP_RECV_TRAILING_METADATA
])
result
=
false
;
result
=
false
;
}
else
if
(
op_id
==
OP_SEND_MESSAGE
)
{
}
else
if
(
op_id
==
OP_SEND_MESSAGE
)
{
/* already executed (note we're checking op specific state, not stream
/* already executed (note we're checking op specific state, not stream
...
@@ -801,7 +818,8 @@ static bool op_can_be_run(grpc_transport_stream_op *curr_op,
...
@@ -801,7 +818,8 @@ static bool op_can_be_run(grpc_transport_stream_op *curr_op,
/* already executed */
/* already executed */
if
(
op_state
->
state_op_done
[
OP_RECV_MESSAGE
])
result
=
false
;
if
(
op_state
->
state_op_done
[
OP_RECV_MESSAGE
])
result
=
false
;
/* we haven't received headers yet. */
/* we haven't received headers yet. */
else
if
(
!
stream_state
->
state_callback_received
[
OP_RECV_INITIAL_METADATA
])
else
if
(
!
stream_state
->
state_callback_received
[
OP_RECV_INITIAL_METADATA
]
&&
!
stream_state
->
state_op_done
[
OP_RECV_TRAILING_METADATA
])
result
=
false
;
result
=
false
;
}
else
if
(
op_id
==
OP_RECV_TRAILING_METADATA
)
{
}
else
if
(
op_id
==
OP_RECV_TRAILING_METADATA
)
{
/* already executed */
/* already executed */
...
@@ -955,12 +973,6 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
...
@@ -955,12 +973,6 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
grpc_slice_buffer_init
(
&
write_slice_buffer
);
grpc_slice_buffer_init
(
&
write_slice_buffer
);
grpc_byte_stream_next
(
NULL
,
stream_op
->
send_message
,
&
slice
,
grpc_byte_stream_next
(
NULL
,
stream_op
->
send_message
,
&
slice
,
stream_op
->
send_message
->
length
,
NULL
);
stream_op
->
send_message
->
length
,
NULL
);
/* Check that compression flag is OFF. We don't support compression yet.
*/
if
(
stream_op
->
send_message
->
flags
!=
0
)
{
gpr_log
(
GPR_ERROR
,
"Compression is not supported"
);
GPR_ASSERT
(
stream_op
->
send_message
->
flags
==
0
);
}
grpc_slice_buffer_add
(
&
write_slice_buffer
,
slice
);
grpc_slice_buffer_add
(
&
write_slice_buffer
,
slice
);
if
(
write_slice_buffer
.
count
!=
1
)
{
if
(
write_slice_buffer
.
count
!=
1
)
{
/* Empty request not handled yet */
/* Empty request not handled yet */
...
@@ -970,7 +982,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
...
@@ -970,7 +982,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
if
(
write_slice_buffer
.
count
>
0
)
{
if
(
write_slice_buffer
.
count
>
0
)
{
size_t
write_buffer_size
;
size_t
write_buffer_size
;
create_grpc_frame
(
&
write_slice_buffer
,
&
stream_state
->
ws
.
write_buffer
,
create_grpc_frame
(
&
write_slice_buffer
,
&
stream_state
->
ws
.
write_buffer
,
&
write_buffer_size
);
&
write_buffer_size
,
stream_op
->
send_message
->
flags
);
CRONET_LOG
(
GPR_DEBUG
,
"bidirectional_stream_write (%p, %p)"
,
s
->
cbs
,
CRONET_LOG
(
GPR_DEBUG
,
"bidirectional_stream_write (%p, %p)"
,
s
->
cbs
,
stream_state
->
ws
.
write_buffer
);
stream_state
->
ws
.
write_buffer
);
stream_state
->
state_callback_received
[
OP_SEND_MESSAGE
]
=
false
;
stream_state
->
state_callback_received
[
OP_SEND_MESSAGE
]
=
false
;
...
@@ -1022,6 +1034,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
...
@@ -1022,6 +1034,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
}
else
if
(
stream_state
->
state_callback_received
[
OP_FAILED
])
{
}
else
if
(
stream_state
->
state_callback_received
[
OP_FAILED
])
{
grpc_closure_sched
(
exec_ctx
,
stream_op
->
recv_initial_metadata_ready
,
grpc_closure_sched
(
exec_ctx
,
stream_op
->
recv_initial_metadata_ready
,
GRPC_ERROR_NONE
);
GRPC_ERROR_NONE
);
}
else
if
(
stream_state
->
state_op_done
[
OP_RECV_TRAILING_METADATA
])
{
grpc_closure_sched
(
exec_ctx
,
stream_op
->
recv_initial_metadata_ready
,
GRPC_ERROR_NONE
);
}
else
{
}
else
{
grpc_chttp2_incoming_metadata_buffer_publish
(
grpc_chttp2_incoming_metadata_buffer_publish
(
exec_ctx
,
&
oas
->
s
->
state
.
rs
.
initial_metadata
,
exec_ctx
,
&
oas
->
s
->
state
.
rs
.
initial_metadata
,
...
@@ -1066,8 +1081,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
...
@@ -1066,8 +1081,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
stream_state
->
rs
.
remaining_bytes
==
0
)
{
stream_state
->
rs
.
remaining_bytes
==
0
)
{
/* Start a read operation for data */
/* Start a read operation for data */
stream_state
->
rs
.
length_field_received
=
true
;
stream_state
->
rs
.
length_field_received
=
true
;
stream_state
->
rs
.
length_field
=
stream_state
->
rs
.
remaining_bytes
=
parse_grpc_header
((
const
uint8_t
*
)
stream_state
->
rs
.
read_buffer
,
parse_grpc_header
((
const
uint8_t
*
)
stream_state
->
rs
.
read_buffer
);
&
stream_state
->
rs
.
length_field
,
&
stream_state
->
rs
.
compressed
);
CRONET_LOG
(
GPR_DEBUG
,
"length field = %d"
,
CRONET_LOG
(
GPR_DEBUG
,
"length field = %d"
,
stream_state
->
rs
.
length_field
);
stream_state
->
rs
.
length_field
);
if
(
stream_state
->
rs
.
length_field
>
0
)
{
if
(
stream_state
->
rs
.
length_field
>
0
)
{
...
@@ -1089,6 +1105,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
...
@@ -1089,6 +1105,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
grpc_slice_buffer_init
(
&
stream_state
->
rs
.
read_slice_buffer
);
grpc_slice_buffer_init
(
&
stream_state
->
rs
.
read_slice_buffer
);
grpc_slice_buffer_stream_init
(
&
stream_state
->
rs
.
sbs
,
grpc_slice_buffer_stream_init
(
&
stream_state
->
rs
.
sbs
,
&
stream_state
->
rs
.
read_slice_buffer
,
0
);
&
stream_state
->
rs
.
read_slice_buffer
,
0
);
if
(
stream_state
->
rs
.
compressed
)
{
stream_state
->
rs
.
sbs
.
base
.
flags
|=
GRPC_WRITE_INTERNAL_COMPRESS
;
}
*
((
grpc_byte_buffer
**
)
stream_op
->
recv_message
)
=
*
((
grpc_byte_buffer
**
)
stream_op
->
recv_message
)
=
(
grpc_byte_buffer
*
)
&
stream_state
->
rs
.
sbs
;
(
grpc_byte_buffer
*
)
&
stream_state
->
rs
.
sbs
;
grpc_closure_sched
(
exec_ctx
,
stream_op
->
recv_message_ready
,
grpc_closure_sched
(
exec_ctx
,
stream_op
->
recv_message_ready
,
...
@@ -1100,6 +1119,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
...
@@ -1100,6 +1119,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
stream_state
->
rs
.
read_buffer
=
stream_state
->
rs
.
grpc_header_bytes
;
stream_state
->
rs
.
read_buffer
=
stream_state
->
rs
.
grpc_header_bytes
;
stream_state
->
rs
.
remaining_bytes
=
GRPC_HEADER_SIZE_IN_BYTES
;
stream_state
->
rs
.
remaining_bytes
=
GRPC_HEADER_SIZE_IN_BYTES
;
stream_state
->
rs
.
received_bytes
=
0
;
stream_state
->
rs
.
received_bytes
=
0
;
stream_state
->
rs
.
compressed
=
false
;
stream_state
->
rs
.
length_field_received
=
false
;
stream_state
->
rs
.
length_field_received
=
false
;
CRONET_LOG
(
GPR_DEBUG
,
"bidirectional_stream_read(%p)"
,
s
->
cbs
);
CRONET_LOG
(
GPR_DEBUG
,
"bidirectional_stream_read(%p)"
,
s
->
cbs
);
stream_state
->
state_op_done
[
OP_READ_REQ_MADE
]
=
stream_state
->
state_op_done
[
OP_READ_REQ_MADE
]
=
...
@@ -1114,6 +1134,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
...
@@ -1114,6 +1134,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
stream_state
->
rs
.
read_buffer
=
stream_state
->
rs
.
grpc_header_bytes
;
stream_state
->
rs
.
read_buffer
=
stream_state
->
rs
.
grpc_header_bytes
;
stream_state
->
rs
.
remaining_bytes
=
GRPC_HEADER_SIZE_IN_BYTES
;
stream_state
->
rs
.
remaining_bytes
=
GRPC_HEADER_SIZE_IN_BYTES
;
stream_state
->
rs
.
received_bytes
=
0
;
stream_state
->
rs
.
received_bytes
=
0
;
stream_state
->
rs
.
compressed
=
false
;
CRONET_LOG
(
GPR_DEBUG
,
"bidirectional_stream_read(%p)"
,
s
->
cbs
);
CRONET_LOG
(
GPR_DEBUG
,
"bidirectional_stream_read(%p)"
,
s
->
cbs
);
stream_state
->
state_op_done
[
OP_READ_REQ_MADE
]
=
stream_state
->
state_op_done
[
OP_READ_REQ_MADE
]
=
true
;
/* Indicates that at least one read request has been made */
true
;
/* Indicates that at least one read request has been made */
...
@@ -1137,6 +1158,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
...
@@ -1137,6 +1158,9 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
read_data_slice
);
read_data_slice
);
grpc_slice_buffer_stream_init
(
&
stream_state
->
rs
.
sbs
,
grpc_slice_buffer_stream_init
(
&
stream_state
->
rs
.
sbs
,
&
stream_state
->
rs
.
read_slice_buffer
,
0
);
&
stream_state
->
rs
.
read_slice_buffer
,
0
);
if
(
stream_state
->
rs
.
compressed
)
{
stream_state
->
rs
.
sbs
.
base
.
flags
=
GRPC_WRITE_INTERNAL_COMPRESS
;
}
*
((
grpc_byte_buffer
**
)
stream_op
->
recv_message
)
=
*
((
grpc_byte_buffer
**
)
stream_op
->
recv_message
)
=
(
grpc_byte_buffer
*
)
&
stream_state
->
rs
.
sbs
;
(
grpc_byte_buffer
*
)
&
stream_state
->
rs
.
sbs
;
grpc_closure_sched
(
exec_ctx
,
stream_op
->
recv_message_ready
,
grpc_closure_sched
(
exec_ctx
,
stream_op
->
recv_message_ready
,
...
@@ -1146,6 +1170,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
...
@@ -1146,6 +1170,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx,
/* Do an extra read to trigger on_succeeded() callback in case connection
/* Do an extra read to trigger on_succeeded() callback in case connection
is closed */
is closed */
stream_state
->
rs
.
read_buffer
=
stream_state
->
rs
.
grpc_header_bytes
;
stream_state
->
rs
.
read_buffer
=
stream_state
->
rs
.
grpc_header_bytes
;
stream_state
->
rs
.
compressed
=
false
;
stream_state
->
rs
.
received_bytes
=
0
;
stream_state
->
rs
.
received_bytes
=
0
;
stream_state
->
rs
.
remaining_bytes
=
GRPC_HEADER_SIZE_IN_BYTES
;
stream_state
->
rs
.
remaining_bytes
=
GRPC_HEADER_SIZE_IN_BYTES
;
stream_state
->
rs
.
length_field_received
=
false
;
stream_state
->
rs
.
length_field_received
=
false
;
...
...
This diff is collapsed.
Click to expand it.
src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m
+
1
−
2
View file @
1855710c
...
@@ -273,8 +273,7 @@ static char *roots_filename;
...
@@ -273,8 +273,7 @@ static char *roots_filename;
}
}
-
(
void
)
testCompressedPayload
{
-
(
void
)
testCompressedPayload
{
// NOT SUPPORTED
[
self
testIndividualCase
:
"compressed_payload"
];
// [self testIndividualCase:"compressed_payload"];
}
}
-
(
void
)
testConnectivity
{
-
(
void
)
testConnectivity
{
...
...
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