admin/mongo-php-driver
1
0
Fork 0
mirror of https://github.com/macintoshplus/mongo-php-driver.git synced 2026-04-27 10:36:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #531

Browse Source
This commit is contained in:
Jeremy Mikola
2017-02-14 12:55:44 -05:00
parent ab2e2b88cc b55ea81fd6
commit 3bce095dde
2 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php_phongo.c
+12 -2
View File
@@ -41,6 +41,14 @@
# include <ext/standard/php_smart_str.h>
#endif
/* getpid() */
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef PHP_WIN32
# include <process.h>
#endif
/* Stream wrapper */
#include <main/php_streams.h>
#include <main/php_network.h>
@@ -1403,7 +1411,8 @@ static char *php_phongo_manager_make_client_hash(const char *uri_string, zval *o
#if PHP_VERSION_ID >= 70000
zval args;
array_init_size(&args, 3);
array_init_size(&args, 4);
ADD_ASSOC_LONG_EX(&args, "pid", getpid());
ADD_ASSOC_STRING(&args, "uri", uri_string);
if (options) {
@@ -1434,7 +1443,8 @@ static char *php_phongo_manager_make_client_hash(const char *uri_string, zval *o
zval *args;
MAKE_STD_ZVAL(args);
array_init_size(args, 3);
array_init_size(args, 4);
ADD_ASSOC_LONG_EX(args, "pid", getpid());
ADD_ASSOC_STRING(args, "uri", uri_string);
if (options) {
tests/manager/bug0913-001.phpt
+66
View File
@@ -0,0 +1,66 @@
--TEST--
PHPC-913: Child process should not re-use mongoc_client_t objects from parent
--SKIPIF--
<?php if (!function_exists('pcntl_fork')) { die('skip pcntl_fork() not available'); } ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE); SLOW(); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
function logMyURI(MongoDB\Driver\Manager $manager)
{
$command = new MongoDB\Driver\Command(['whatsmyuri' => 1]);
$cursor = $manager->executeCommand(DATABASE_NAME, $command);
$uri = $cursor->toArray()[0]->you;
$bulk = new MongoDB\Driver\BulkWrite();
$bulk->insert(['pid' => getmypid(), 'uri' => $uri]);
$manager->executeBulkWrite(NS, $bulk);
}
$manager = new MongoDB\Driver\Manager(STANDALONE);
logMyURI($manager);
$parentPid = getmypid();
$childPid = pcntl_fork();
if ($childPid === 0) {
$manager = new MongoDB\Driver\Manager(STANDALONE);
logMyURI($manager);
/* Due to PHPC-912, we cannot allow the child process to terminate before
* the parent is done using its client, lest it destroy the mongoc_client_t
* object and shutdown its socket(s). Sleep for 250ms to allow the parent
* time to query for our logged URI. */
usleep(250000);
exit;
}
if ($childPid) {
/* Sleep for 100ms to allow the child time to log its URI. Ideally, we would
* wait for the child to finish, but PHPC-912 prevents us from doing so. */
usleep(100000);
$cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query([]));
$results = $cursor->toArray();
printf("%d connections were logged\n", count($results));
printf("PIDs differ: %s\n", $results[0]->pid !== $results[1]->pid ? 'yes' : 'no');
printf("URIs differ: %s\n", $results[0]->uri !== $results[1]->uri ? 'yes' : 'no');
$waitPid = pcntl_waitpid($childPid, $status);
if ($waitPid > 0) {
printf("Parent(%d) waited for child(%d) to exit\n", $parentPid, $waitPid);
}
}
?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
2 connections were logged
PIDs differ: yes
URIs differ: yes
Parent(%d) waited for child(%d) to exit
===DONE===