php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 19:52:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

stop multiple executions from occuring at once, #5

Browse Source
This commit is contained in:
krakjoe
2013-11-11 15:54:33 +00:00
parent da065d6fb2
commit 3e3a7babad
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpdbg.c
View File

@@ -396,7 +396,7 @@ int main(int argc, char *argv[]) /* {{{ */
zend_try {
phpdbg_interactive(TSRMLS_C);
} zend_catch {
} zend_end_try();
} while(!PHPDBG_G(quitting));

23
phpdbg_prompt.c
View File

@@ -110,6 +110,11 @@ static PHPDBG_COMMAND(next) /* {{{ */
static PHPDBG_COMMAND(run) /* {{{ */
{
if (EG(in_execution)) {
printf("[Cannot start another execution while on is in progress]\n");
return FAILURE;
}
if (PHPDBG_G(ops) || PHPDBG_G(exec)) {
if (!PHPDBG_G(ops)) {
if (phpdbg_compile(TSRMLS_C) == FAILURE) {
@@ -528,7 +533,9 @@ zend_vm_enter:
if (PHPDBG_G(has_file_bp)
&& phpdbg_find_breakpoint_file(execute_data->op_array TSRMLS_CC) == SUCCESS) {
while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
continue;
if (!PHPDBG_G(quitting)) {
continue;
}
}
}
@@ -540,7 +547,9 @@ zend_vm_enter:
if (phpdbg_find_breakpoint_symbol(
previous->function_state.function TSRMLS_CC) == SUCCESS) {
while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
continue;
if (!PHPDBG_G(quitting)) {
continue;
}
}
}
}
@@ -550,10 +559,12 @@ zend_vm_enter:
if (PHPDBG_G(has_opline_bp)
&& phpdbg_find_breakpoint_opline(execute_data->opline TSRMLS_CC) == SUCCESS) {
while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
continue;
if (!PHPDBG_G(quitting)) {
continue;
}
}
}
PHPDBG_G(vmret) = execute_data->opline->handler(execute_data TSRMLS_CC);
phpdbg_print_opline(
@@ -561,7 +572,9 @@ zend_vm_enter:
if (PHPDBG_G(stepping)) {
while (phpdbg_interactive(TSRMLS_C) != PHPDBG_NEXT) {
continue;
if (!PHPDBG_G(quitting)) {
continue;
}
}
}

1
test.php
View File

@@ -6,6 +6,7 @@ function test() {
$hidden = "variable";
phpdbg_break();
}
function test2() {
echo "Hello World 2\n";
}