Php8

.github/workflows/main.yml

@@ -0,0 +1,105 @@
+name: Quanta PHP Module builder
+
+on:
+  pull_request:
+    branches:
+      - '**'
+    types:
+      - opened
+      - edited
+      - synchronize
+      - labeled
+
+  workflow_dispatch:
+
+permissions:
+  id-token: write
+  contents: read
+
+env:
+  PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  builds:
+    if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'release')
+    environment: build
+    name: '[${{ matrix.os }}][${{ matrix.version }}][${{ matrix.php-version }}] - Quanta PHP Module Builds'
+    runs-on: ubuntu-latest
+    # needs: detect-version
+    strategy:
+      fail-fast: false
+      matrix:
+        # os: [debian, centos, ubuntu]
+        os: [ubuntu]
+        version: [jammy, kinetic, lunar]
+        # version: [buster, bullseye, bookworm, 7, 8, 9, jammy, kinetic, lunar]
+        php-version: [php73, php74, php80, php81, php82, php83]
+        # exclude:
+        #   - os: debian
+        #     version: 7
+        #   - os: debian
+        #     version: 8
+        #   - os: debian
+        #     version: 9
+        #   - os: debian
+        #     version: jammy
+        #   - os: debian
+        #     version: kinetic
+        #   - os: debian
+        #     version: lunar
+        #   - os: centos
+        #     version: buster
+        #   - os: centos
+        #     version: bullseye
+        #   - os: centos
+        #     version: bookworm
+        #   - os: centos
+        #     version: jammy
+        #   - os: centos
+        #     version: kinetic
+        #   - os: centos
+        #     version: lunar
+        #   - os: ubuntu
+        #     version: buster
+        #   - os: ubuntu
+        #     version: bullseye
+        #   - os: ubuntu
+        #     version: bookworm
+        #   - os: ubuntu
+        #     version: 7
+        #   - os: ubuntu
+        #     version: 8
+        #   - os: ubuntu
+        #     version: 9
+
+
+    steps:
+    - name: Clone Quanta PHP module repository
+      uses: actions/checkout@v3
+      with:
+        path: quanta-php-module
+
+    - name: Clone Buildozer repository
+      uses: actions/checkout@v3
+      with:
+        ssh-key: ${{ secrets.BUILDOZER_DEPLOY_KEY }}
+        repository: quanta-computing/buildozer
+        ref: 'new-packages-worflow'
+        persist-credentials: true
+        path: tools
+
+    - name: Build php module packages
+      run: |
+        cd tools
+        ./buildozer -t ${{ matrix.php-version }}-quanta-mon -o ${{ matrix.os }} -v ${{ matrix.version }} -s ../quanta-php-module/extension/ -r 1.3.4
+
+    - name: Upload packages
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ matrix.os }}-${{ matrix.version }}_${{ matrix.php-version }}-quanta-mon-1.3.4.tgz
+        path: tools/${{ matrix.os }}/${{ matrix.version }}/pkg/
+
+  #   - name: Pelletesting
+  #     run: |
+  #       cd tools
+  #       ./pelletesteuse -t ${{ matrix.php-version }}-quanta-mon -o debian -v ${{ matrix.debian-version }} -r 1.3.4

.gitignore

@@ -3,6 +3,7 @@
 *.ko
 *.obj
 *.elf
+*.dep
 
 # Precompiled Headers
 *.gch
@@ -102,6 +103,7 @@ extension/config.nice
 extension/config.status
 extension/config.sub
 extension/configure
+extension/configure.ac
 extension/configure.in
 extension/install-sh
 extension/libtool

extension/config.m4

@@ -72,7 +72,6 @@ if test "$PHP_QUANTAMON" != "no"; then
     src/utils/safe_get_constant.c \
     src/utils/this.c \
     src/utils/timing.c \
-    src/utils/zend_hash.c \
     src/utils/zend_obj.c \
     src/utils/zend_zval.c \
     src/applications.c, $ext_shared,,-W -Wall -Wextra -Wno-unused-parameter -D_GNU_SOURCE)

extension/gen_app_trees.rb

@@ -47,7 +47,7 @@ def print depth, text
 def compile_node app_name, node, depth = 0
   if node[:children].empty?
     print depth, "++hp_globals.internal_match_counters.function;"
-    print depth, "const char *class_name = hp_get_class_name(data TSRMLS_CC);";
+    print depth, "const char *class_name = hp_get_class_name(data);";
     print depth, "if (!class_name) return NULL;"
     node[:value].each do |value|
       print depth, "if (!strcmp(class_name, \"#{value[:class_name].gsub '\\', '\\\\\\\\'}\"))"
@@ -64,7 +64,7 @@ def compile_node app_name, node, depth = 0
 end
 
 def compile_tree app_name, tree
-  puts "profiled_function_t *#{app_name}_match_function(const char* function_name, zend_execute_data* data TSRMLS_DC) {"
+  puts "profiled_function_t *#{app_name}_match_function(const char* function_name, zend_execute_data* data) {"
   puts " ++hp_globals.internal_match_counters.total;"
   compile_node app_name, tree
   puts "}"
@@ -153,7 +153,7 @@ def compile_profiled_application name, app
 def compile_app_first_node node, depth = 0
   if node[:children].empty?
     print depth, "++hp_globals.internal_match_counters.function;"
-    print depth, "const char *class_name = hp_get_class_name(data TSRMLS_CC);";
+    print depth, "const char *class_name = hp_get_class_name(data);";
     print depth, "if (!class_name) return NULL;"
     node[:value].each do |value|
       print depth, "if (!strcmp(class_name, \"#{value[:class_name].gsub '\\', '\\\\\\\\'}\"))"
@@ -171,7 +171,7 @@ def compile_app_first_node node, depth = 0
 
 def compile_app_first_tree tree
   puts "profiled_application_t *qm_match_first_app_function(const char* function_name,"
-  puts "zend_execute_data* data TSRMLS_DC) {"
+  puts "zend_execute_data* data) {"
   puts " ++hp_globals.internal_match_counters.total;"
   compile_app_first_node tree
   puts "}"

extension/include/magento1.h

@@ -2,16 +2,16 @@
 #define QM_MAGENTO1_H_
 
 int magento1_record_reindex_event(profiled_application_t *app, profiled_function_t *function,
-  zend_execute_data *execute_data TSRMLS_DC);
+  zend_execute_data *execute_data);
 int magento1_record_cache_clean_event(profiled_application_t *app, profiled_function_t *function,
-  zend_execute_data *execute_data TSRMLS_DC);
+  zend_execute_data *execute_data);
 int magento1_record_process_index_event(profiled_application_t *app, profiled_function_t *function,
-  zend_execute_data *execute_data TSRMLS_DC);
+  zend_execute_data *execute_data);
 
 int magento1_block_before_render(profiled_application_t *app, profiled_function_t *function,
-  zend_execute_data *execute_data TSRMLS_DC);
+  zend_execute_data *execute_data);
 
 int magento1_fetch_version(profiled_application_t *app, profiled_function_t *function,
-  zend_execute_data *data TSRMLS_DC);
+  zend_execute_data *data);
 
 #endif /* end of include guard: QM_MAGENTO1_H_ */

extension/include/magento2.h

@@ -2,14 +2,14 @@
 #define QM_MAGENTO2_H_
 
 int magento2_block_before_render(profiled_application_t *app, profiled_function_t *function,
-  zend_execute_data *execute_data TSRMLS_DC);
+  zend_execute_data *execute_data);
 
 int magento2_record_reindex_event(profiled_application_t *app, profiled_function_t *function,
-  zend_execute_data *execute_data TSRMLS_DC);
+  zend_execute_data *execute_data);
 int magento2_record_cache_clean_event(profiled_application_t *app, profiled_function_t *function,
-  zend_execute_data *execute_data TSRMLS_DC);
+  zend_execute_data *execute_data);
 
 int magento2_fetch_version(profiled_application_t *app, profiled_function_t *function,
-  zend_execute_data *ex TSRMLS_DC);
+  zend_execute_data *ex);
 
 #endif /* end of include guard: QM_MAGENTO2_H_ */