From: krakjoe <joe.watkins@live.co.uk>
Date: Thu, 14 Nov 2013 23:06:31 +0000 (+0000)
Subject: include conditional breakpoints in out
X-Git-Tag: php-5.6.0alpha1~110^2~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76ec5635a49e4b2a13266eb4ffb6f0b80b3f9571;p=php

include conditional breakpoints in out
---

diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index 5787943d14..350c2e7aad 100644
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -487,6 +487,19 @@ void phpdbg_print_breakpoints(zend_ulong type TSRMLS_DC) /* {{{ */
                  phpdbg_writeln("#%d\t\t%#lx", brake->id, brake->opline);
             }
         } break;
+        
+        case PHPDBG_BREAK_COND: if ((PHPDBG_G(flags) & PHPDBG_HAS_COND_BP)) {
+            HashPosition position;
+            phpdbg_breakcond_t *brake;
+
+            phpdbg_writeln(SEPARATE);
+            phpdbg_writeln("Conditional Breakpoints:");
+            for (zend_hash_internal_pointer_reset_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position);
+                 zend_hash_get_current_data_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], (void**) &brake, &position) == SUCCESS;
+                 zend_hash_move_forward_ex(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], &position)) {
+                 phpdbg_writeln("#%d\t\t%s", brake->id, Z_STRVAL(brake->code));
+            }
+        } break;
     }
 } /* }}} */
 
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index bf016ea8a3..a7f689bb8e 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -386,7 +386,8 @@ static PHPDBG_COMMAND(print) /* {{{ */
     phpdbg_print_breakpoints(PHPDBG_BREAK_SYM TSRMLS_CC);
     phpdbg_print_breakpoints(PHPDBG_BREAK_METHOD TSRMLS_CC);
     phpdbg_print_breakpoints(PHPDBG_BREAK_OPLINE TSRMLS_CC);
-
+    phpdbg_print_breakpoints(PHPDBG_BREAK_COND TSRMLS_CC);
+    
     phpdbg_writeln(SEPARATE);
 
 	return SUCCESS;
@@ -471,6 +472,7 @@ static PHPDBG_COMMAND(clear) /* {{{ */
     phpdbg_writeln("Functions\t\t%d", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_SYM]));
     phpdbg_writeln("Methods\t\t\t%d", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_METHOD]));
     phpdbg_writeln("Oplines\t\t\t%d", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_OPLINE]));
+    phpdbg_writeln("Conditionals\t\t%d", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_COND]));
 
     phpdbg_clear_breakpoints(TSRMLS_C);