- Get rid llist from symbol breakpoint

diff --git a/phpdbg.c b/phpdbg.c
index c15c718b9d196f8ad182ca7bea95b5c2bb439bfa..1a62bcac612bec997d522db9af05cd600fdb5aad 100644 (file)
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -18,6 +18,7 @@
 
 #include "phpdbg.h"
 #include "phpdbg_prompt.h"
+#include "phpdbg_bp.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(phpdbg);
 
@@ -44,15 +45,20 @@ static PHP_MINIT_FUNCTION(phpdbg) /* {{{ */
     return SUCCESS;
 } /* }}} */
 
-static void php_phpdbg_destroy_break(void *brake) /* {{{ */
+static void php_phpdbg_destroy_bp_file(void *brake) /* {{{ */
 {
        zend_llist_destroy((zend_llist*)brake);
 } /* }}} */
 
+static void php_phpdbg_destroy_bp_symbol(void *brake) /* {{{ */
+{
+       efree(((phpdbg_breaksymbol_t*)brake)->symbol);
+} /* }}} */
+
 static PHP_RINIT_FUNCTION(phpdbg) /* {{{ */
 {
-       zend_hash_init(&PHPDBG_G(bp_files),   8, NULL, php_phpdbg_destroy_break, 0);
-       zend_hash_init(&PHPDBG_G(bp_symbols), 8, NULL, php_phpdbg_destroy_break, 0);
+       zend_hash_init(&PHPDBG_G(bp_files),   8, NULL, php_phpdbg_destroy_bp_file, 0);
+       zend_hash_init(&PHPDBG_G(bp_symbols), 8, NULL, php_phpdbg_destroy_bp_symbol, 0);
 
        return SUCCESS;
 } /* }}} */

diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index d3787349600f768dd081e0b32c7115d3ae90c6ed..4680e3ab50593b8cc7ac2441bd2b833390679428 100644 (file)
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -32,13 +32,6 @@ static void phpdbg_llist_breakfile_dtor(void *data) /* {{{ */
        efree((char*)bp->filename);
 } /* }}} */
 
-static void phpdbg_llist_breaksym_dtor(void *data) /* {{{ */
-{
-       phpdbg_breaksymbol_t *bp = (phpdbg_breaksymbol_t*) data;
-
-       efree((char*)bp->symbol);
-} /* }}} */
-
 void phpdbg_set_breakpoint_file(const char *path, long line_num TSRMLS_DC) /* {{{ */
 {
        phpdbg_breakfile_t new_break;
@@ -66,31 +59,21 @@ void phpdbg_set_breakpoint_file(const char *path, long line_num TSRMLS_DC) /* {{
        zend_llist_add_element(break_files_ptr, &new_break);
 } /* }}} */
 
-void phpdbg_set_breakpoint_symbol(const char *name, long opline_num TSRMLS_DC) /* {{{ */
+void phpdbg_set_breakpoint_symbol(const char *name TSRMLS_DC) /* {{{ */
 {
-       phpdbg_breaksymbol_t new_break;
-       zend_llist *break_sym_ptr;
        size_t name_len = strlen(name);
 
-       new_break.symbol = estrndup(name, name_len + 1);
-       new_break.opline_num = opline_num;
-
-       PHPDBG_G(has_sym_bp) = 1;
+       if (!zend_hash_exists(&PHPDBG_G(bp_symbols), name, name_len)) {
+               phpdbg_breaksymbol_t new_break;
 
-       if (zend_hash_find(&PHPDBG_G(bp_symbols),
-               new_break.symbol, name_len, (void**)&break_sym_ptr) == FAILURE) {
-               zend_llist break_syms;
+               PHPDBG_G(has_sym_bp) = 1;
 
-               zend_llist_init(&break_syms, sizeof(phpdbg_breaksymbol_t),
-                       phpdbg_llist_breaksym_dtor, 0);
+               new_break.symbol = estrndup(name, name_len + 1);
+               new_break.id = PHPDBG_G(bp_count)++;
 
-               zend_hash_update(&PHPDBG_G(bp_symbols),
-                       new_break.symbol, name_len, &break_syms, sizeof(zend_llist),
-                       (void**)&break_sym_ptr);
+               zend_hash_update(&PHPDBG_G(bp_symbols), new_break.symbol,
+                       name_len, &new_break, sizeof(phpdbg_breaksymbol_t), NULL);
        }
-
-       new_break.id = PHPDBG_G(bp_count)++;
-       zend_llist_add_element(break_sym_ptr, &new_break);
 } /* }}} */
 
 int phpdbg_find_breakpoint_file(zend_op_array *op_array TSRMLS_DC) /* {{{ */
@@ -119,7 +102,7 @@ int phpdbg_find_breakpoint_file(zend_op_array *op_array TSRMLS_DC) /* {{{ */
 int phpdbg_find_breakpoint_symbol(zend_function *fbc TSRMLS_DC) /* {{{ */
 {
        const char *fname;
-       zend_llist *break_list;
+       phpdbg_breaksymbol_t *bp;
 
        if (fbc->type != ZEND_USER_FUNCTION) {
                return FAILURE;
@@ -130,10 +113,11 @@ int phpdbg_find_breakpoint_symbol(zend_function *fbc TSRMLS_DC) /* {{{ */
        if (!fname) {
                fname = "main";
        }
-    
+
        if (zend_hash_find(&PHPDBG_G(bp_symbols), fname, strlen(fname),
-               (void**)&break_list) == SUCCESS) {
-               printf("breakpoint reached!\n");
+               (void**)&bp) == SUCCESS) {
+               printf("Breakpoint #%d in %s() at %s\n", bp->id, bp->symbol,
+                       zend_get_executed_filename(TSRMLS_C));
                return SUCCESS;
        }
 

diff --git a/phpdbg_bp.h b/phpdbg_bp.h
index 45f4239eafd5ec9b56ee62a3036d176fac838360..104e9d0c1d9aa90efe9848b3340d47c24109043f 100644 (file)
--- a/phpdbg_bp.h
+++ b/phpdbg_bp.h
@@ -34,12 +34,11 @@ typedef struct _phpdbg_breakfile_t {
  */
 typedef struct _phpdbg_breaksymbol_t {
        const char *symbol;
-       long opline_num;
        int id;
 } phpdbg_breaksymbol_t;
 
 void phpdbg_set_breakpoint_file(const char*, long TSRMLS_DC);
-void phpdbg_set_breakpoint_symbol(const char*, long TSRMLS_DC);
+void phpdbg_set_breakpoint_symbol(const char* TSRMLS_DC);
 
 int phpdbg_find_breakpoint_file(zend_op_array* TSRMLS_DC);
 int phpdbg_find_breakpoint_symbol(zend_function* TSRMLS_DC);

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 284f32d861919ed2d1a68c7cd26de39bacd3a70d..d064d2dd378f46b39810dd2adf5182311dd7aabd 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -72,7 +72,7 @@ static inline int phpdbg_compile(TSRMLS_D) /* {{{ */
        } else {
            printf("Cannot compile while in execution\n");
        }
-       
+
        return FAILURE;
 } /* }}} */
 
@@ -228,14 +228,13 @@ static PHPDBG_COMMAND(break) /* {{{ */
                phpdbg_set_breakpoint_file(resolved_name, line_num TSRMLS_CC);
        } else {
                char name[200];
-               const char *opnum_pos = zend_memrchr(expr, '#', expr_len);
-               long opline_num = opnum_pos ? strtol(opnum_pos+1, NULL, 0) : 0;
-               size_t name_len = opnum_pos ? opnum_pos - expr : strlen(expr);
+               size_t name_len = strlen(expr);
 
+               name_len = MIN(name_len, 200);
                memcpy(name, expr, name_len);
                name[name_len] = 0;
 
-               phpdbg_set_breakpoint_symbol(name, opline_num TSRMLS_CC);
+               phpdbg_set_breakpoint_symbol(name TSRMLS_CC);
        }
 
        return SUCCESS;
@@ -336,7 +335,7 @@ int phpdbg_interactive(int argc, char **argv TSRMLS_DC) /* {{{ */
                            }
                        break;
 
-                       case PHPDBG_NEXT: 
+                       case PHPDBG_NEXT:
                            return PHPDBG_NEXT;
 
                    }
@@ -375,7 +374,7 @@ zend_vm_enter:
                }
 #endif
 
-        if (PHPDBG_G(has_file_bp) 
+        if (PHPDBG_G(has_file_bp)
                        && phpdbg_find_breakpoint_file(execute_data->op_array TSRMLS_CC) == SUCCESS) {
                        while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
                                continue;
@@ -384,21 +383,21 @@ zend_vm_enter:
 
         if (PHPDBG_G(has_sym_bp)) {
             zend_execute_data *previous = execute_data->prev_execute_data;
-            if (previous && (previous != execute_data)) {
-                if (previous->opline) {
-                    if (previous->opline->opcode == ZEND_DO_FCALL || previous->opline->opcode == ZEND_DO_FCALL_BY_NAME) {
-                        if (phpdbg_find_breakpoint_symbol(previous->function_state.function TSRMLS_CC) == SUCCESS) {
-                            while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
-                                               continue;
-                                       }
-                        }
-                    }
-                }
-            }
+            if (previous && previous != execute_data && previous->opline) {
+                               if (previous->opline->opcode == ZEND_DO_FCALL
+                                       || previous->opline->opcode == ZEND_DO_FCALL_BY_NAME) {
+                                       if (phpdbg_find_breakpoint_symbol(
+                                               previous->function_state.function TSRMLS_CC) == SUCCESS) {
+                                               while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {
+                                                       continue;
+                                               }
+                                       }
+                               }
+                       }
         }
-               
+
                PHPDBG_G(vmret) = execute_data->opline->handler(execute_data TSRMLS_CC);
-               
+
                phpdbg_print_opline(
                    execute_data TSRMLS_CC);