Changeset 208 for trunk

Timestamp:

2006-10-01T12:55:48+02:00 (7 years ago)

Author:

moo

Message:

coverager: simplify cov data and fix clean

File:

• trunk/coverager.c (modified) (7 diffs)

trunk/coverager.c

@@ -147 +147 @@
             for (; len >= sizeof(long) * 2; len -= sizeof(long) * 2, p += 2) {
                 if (zend_hash_index_find(cov, p[0], (void**)&phits) == SUCCESS) {
-                    if (p[1] <= 0) {
-                        /* already marked */
+                    if (p[1] == 0) {
+                        /* OPTIMIZE: already marked */
                         continue;
                     }
-                    if (*phits > 0) {
-                        p[1] += *phits;
-                    }
+                    p[1] += *phits;
                 }
                 zend_hash_index_update(cov, p[0], &p[1], sizeof(p[1]), NULL);
@@ -173 +171 @@
     while (zend_hash_get_current_data_ex(cov, (void**)&phits, &pos) == SUCCESS) {
         *p++ = pos->h;
-        if (*phits <= 0) {
-            *p++ = 0;
-        }
-        else {
-            *p++ = *phits;
+        *p++ = *phits;
+        if (*phits > 0) {
             covlines ++;
         }
@@ -208 +203 @@
 {
     if (XG(coverages)) {
+        HashPosition pos;
+        coverager_t *pcov;
+
+        zend_hash_internal_pointer_reset_ex(XG(coverages), &pos);
+        while (zend_hash_get_current_data_ex(XG(coverages), (void **) &pcov, &pos) == SUCCESS) {
+            long *phits;
+            coverager_t cov;
+            HashPosition pos2;
+            uint size;
+
+            cov = *pcov;
+
+            zend_hash_internal_pointer_reset_ex(cov, &pos2);
+            while (zend_hash_get_current_data_ex(cov, (void**)&phits, &pos2) == SUCCESS) {
+                long hits = *phits;
+
+                if (hits != 0) {
+                    hits = 0;
+                    zend_hash_index_update(cov, pos2->h, &hits, sizeof(hits), NULL);
+                }
+                zend_hash_move_forward_ex(cov, &pos2);
+            }
+
+            zend_hash_move_forward_ex(XG(coverages), &pos);
+        }
+    }
+}
+/* }}} */
+static void xc_coverager_cleanup(TSRMLS_D) /* {{{ */
+{
+    if (XG(coverages)) {
         zend_hash_destroy(XG(coverages));
         efree(XG(coverages));
@@ -218 +244 @@
 {
     XG(coverage_enabled) = 1;
-    xc_coverager_initenv(TSRMLS_C);
 }
 /* }}} */
@@ -316 +341 @@
     if (XG(coverager)) {
         xc_coverager_autodump(TSRMLS_C);
-        xc_coverager_clean(TSRMLS_C);
+        xc_coverager_cleanup(TSRMLS_C);
     }
 }
@@ -352 +377 @@
     }
     if (zend_hash_index_find(cov, line, (void**)&poldhits) == SUCCESS) {
-        if (hits == -1) {
-            /* already marked */
+        if (hits == 0) {
+            /* OPTIMIZE: already marked */
             return;
         }
-        if (*poldhits != -1) {
-            hits += *poldhits;
-        }
+        hits += *poldhits;
     }
     zend_hash_index_update(cov, line, &hits, sizeof(hits), NULL);
@@ -407 +430 @@
             case ZEND_EXT_FCALL_END:
 #endif
-                xc_coverager_add_hits(cov, op_array->opcodes[i].lineno, -1 TSRMLS_CC);
+                xc_coverager_add_hits(cov, op_array->opcodes[i].lineno, 0 TSRMLS_CC);
                 break;
         }