Skip to content
Snippets Groups Projects
Commit dba87897 authored by mlumish's avatar mlumish Committed by Craig Tiller
Browse files

Replaced calls to grpc_call_accept with newer functions

	Change on 2015/01/02 by mlumish <mlumish@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=83145830
parent fa37163f
No related branches found
No related tags found
No related merge requests found
...@@ -292,19 +292,17 @@ PHP_METHOD(Call, start_invoke){ ...@@ -292,19 +292,17 @@ PHP_METHOD(Call, start_invoke){
* (optional) * (optional)
* @return long Error code * @return long Error code
*/ */
PHP_METHOD(Call, accept){ PHP_METHOD(Call, server_accept){
long tag; long tag;
zval *queue_obj; zval *queue_obj;
long flags = 0; /* "Ol|l" == 1 Object, 1 long */
/* "Ol|l" == 1 Object, 1 mandatory long, 1 optional long */
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"Ol|l", "Ol",
&queue_obj, grpc_ce_completion_queue, &queue_obj, grpc_ce_completion_queue,
&tag, &tag) == FAILURE){
&flags) == FAILURE){
zend_throw_exception( zend_throw_exception(
spl_ce_InvalidArgumentException, spl_ce_InvalidArgumentException,
"accept expects a CompletionQueue, a long, and an optional long", "server_accept expects a CompletionQueue, a long, and an optional long",
1 TSRMLS_CC); 1 TSRMLS_CC);
return; return;
} }
...@@ -314,10 +312,25 @@ PHP_METHOD(Call, accept){ ...@@ -314,10 +312,25 @@ PHP_METHOD(Call, accept){
wrapped_grpc_completion_queue *queue = wrapped_grpc_completion_queue *queue =
(wrapped_grpc_completion_queue*)zend_object_store_get_object( (wrapped_grpc_completion_queue*)zend_object_store_get_object(
queue_obj TSRMLS_CC); queue_obj TSRMLS_CC);
RETURN_LONG(grpc_call_accept(call->wrapped, RETURN_LONG(grpc_call_server_accept(call->wrapped,
queue->wrapped, queue->wrapped,
(void*)tag, (void*)tag));
(gpr_uint32)flags)); }
PHP_METHOD(Call, server_end_initial_metadata) {
long flags = 0;
/* "|l" == 1 optional long */
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|l",
&flags) == FAILURE) {
zend_throw_exception(
spl_ce_InvalidArgumentException,
"server_end_initial_metadata expects an optional long",
1 TSRMLS_CC);
}
wrapped_grpc_call *call = (wrapped_grpc_call*)zend_object_store_get_object(
getThis() TSRMLS_CC);
RETURN_LONG(grpc_call_server_end_initial_metadata(call->wrapped, flags));
} }
/** /**
...@@ -435,7 +448,8 @@ PHP_METHOD(Call, start_read){ ...@@ -435,7 +448,8 @@ PHP_METHOD(Call, start_read){
static zend_function_entry call_methods[] = { static zend_function_entry call_methods[] = {
PHP_ME(Call, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(Call, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
PHP_ME(Call, accept, NULL, ZEND_ACC_PUBLIC) PHP_ME(Call, server_accept, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Call, server_end_initial_metadata, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Call, add_metadata, NULL, ZEND_ACC_PUBLIC) PHP_ME(Call, add_metadata, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Call, cancel, NULL, ZEND_ACC_PUBLIC) PHP_ME(Call, cancel, NULL, ZEND_ACC_PUBLIC)
PHP_ME(Call, start_invoke, NULL, ZEND_ACC_PUBLIC) PHP_ME(Call, start_invoke, NULL, ZEND_ACC_PUBLIC)
......
...@@ -52,7 +52,12 @@ class EndToEndTest extends PHPUnit_Framework_TestCase{ ...@@ -52,7 +52,12 @@ class EndToEndTest extends PHPUnit_Framework_TestCase{
$server_call = $event->get_call(); $server_call = $event->get_call();
$this->assertNotNull($server_call); $this->assertNotNull($server_call);
$this->assertEquals(Grpc\CALL_OK, $this->assertEquals(Grpc\CALL_OK,
$server_call->accept($this->server_queue, $server_tag)); $server_call->server_accept($this->server_queue,
$server_tag));
$this->assertEquals(Grpc\CALL_OK,
$server_call->server_end_initial_metadata());
// the server sends the status // the server sends the status
$this->assertEquals(Grpc\CALL_OK, $this->assertEquals(Grpc\CALL_OK,
...@@ -125,7 +130,11 @@ class EndToEndTest extends PHPUnit_Framework_TestCase{ ...@@ -125,7 +130,11 @@ class EndToEndTest extends PHPUnit_Framework_TestCase{
$server_call = $event->get_call(); $server_call = $event->get_call();
$this->assertNotNull($server_call); $this->assertNotNull($server_call);
$this->assertEquals(Grpc\CALL_OK, $this->assertEquals(Grpc\CALL_OK,
$server_call->accept($this->server_queue, $server_tag)); $server_call->server_accept($this->server_queue,
$server_tag));
$this->assertEquals(Grpc\CALL_OK,
$server_call->server_end_initial_metadata());
// start the server read // start the server read
$this->assertEquals(Grpc\CALL_OK, $server_call->start_read($server_tag)); $this->assertEquals(Grpc\CALL_OK, $server_call->start_read($server_tag));
......
...@@ -62,7 +62,11 @@ class SecureEndToEndTest extends PHPUnit_Framework_TestCase{ ...@@ -62,7 +62,11 @@ class SecureEndToEndTest extends PHPUnit_Framework_TestCase{
$server_call = $event->get_call(); $server_call = $event->get_call();
$this->assertNotNull($server_call); $this->assertNotNull($server_call);
$this->assertEquals(Grpc\CALL_OK, $this->assertEquals(Grpc\CALL_OK,
$server_call->accept($this->server_queue, $server_tag)); $server_call->server_accept($this->server_queue,
$server_tag));
$this->assertEquals(Grpc\CALL_OK,
$server_call->server_end_initial_metadata());
// the server sends the status // the server sends the status
$this->assertEquals(Grpc\CALL_OK, $this->assertEquals(Grpc\CALL_OK,
...@@ -135,7 +139,11 @@ class SecureEndToEndTest extends PHPUnit_Framework_TestCase{ ...@@ -135,7 +139,11 @@ class SecureEndToEndTest extends PHPUnit_Framework_TestCase{
$server_call = $event->get_call(); $server_call = $event->get_call();
$this->assertNotNull($server_call); $this->assertNotNull($server_call);
$this->assertEquals(Grpc\CALL_OK, $this->assertEquals(Grpc\CALL_OK,
$server_call->accept($this->server_queue, $server_tag)); $server_call->server_accept($this->server_queue,
$server_tag));
$this->assertEquals(Grpc\CALL_OK,
$server_call->server_end_initial_metadata());
// start the server read // start the server read
$this->assertEquals(Grpc\CALL_OK, $server_call->start_read($server_tag)); $this->assertEquals(Grpc\CALL_OK, $server_call->start_read($server_tag));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment