Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@NoiseByNorthwest
NoiseByNorthwest committed Sep 8, 2024
1 parent b4a3419 commit 38263ad
Show file tree
Hide file tree
Showing 10 changed files with 226 additions and 135 deletions.
243 changes: 139 additions & 104 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,113 +14,148 @@ on:
- master

jobs:
build:
name: build / php-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.compiler }}

runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]

name:
- linux
- debian
- mac

include:
# Linux
- { name: linux, ts: 'nts', compiler: 'gcc', os: ubuntu-20.04 }
# Debian (docker)
- { name: debian, ts: 'nts', compiler: 'gcc', os: ubuntu-20.04 }
# macOS
- { name: mac, ts: 'nts', compiler: 'clang', os: macos-12 }

# build:
# name: build / php-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.compiler }}

# runs-on: ${{ matrix.os }}
# strategy:
# fail-fast: false
# matrix:
# php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]

# name:
# - linux
# - debian
# - mac

# include:
# # Linux
# - { name: linux, ts: 'nts', compiler: 'gcc', os: ubuntu-20.04 }
# # Debian (docker)
# - { name: debian, ts: 'nts', compiler: 'gcc', os: ubuntu-20.04 }
# # macOS
# - { name: mac, ts: 'nts', compiler: 'clang', os: macos-12 }

# steps:
# - uses: actions/checkout@v3

# # configure spx artifact name in next format:
# # {php}-{ts}-{os.name}-{compiler}
# # spx-php-8.1-nts-linux-gcc
# - name: Set artifact name
# id: setup-artifact
# run: |
# echo "spx_file_name=spx-php-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.compiler }}" >> $GITHUB_OUTPUT

# - name: Build extension for Ubuntu and macOS
# if: matrix.name != 'debian'
# uses: ./.github/workflows/build-linux-mac-ext

# - name: Build extension for Debian using docker
# if: matrix.name == 'debian' && matrix.php != '5.4' && matrix.php != '5.5'
# uses: ./.github/workflows/build-debian-ext

# - name: Upload build artifacts after Failure
# if: failure()
# uses: actions/upload-artifact@v3
# with:
# name: debug-${{ steps.setup-artifact.outputs.spx_file_name }}
# path: |
# ${{ github.workspace }}/*.log
# ${{ github.workspace }}/tests/*.log
# retention-days: 7

# - name: Create ZIP archive with build artifact
# run: |
# zip -rvj ${{ steps.setup-artifact.outputs.spx_file_name }}.zip \
# ./modules/spx.so LICENSE $ZIP_EXCLUDE
# zip -rv ${{ steps.setup-artifact.outputs.spx_file_name }}.zip \
# ./assets $ZIP_EXCLUDE
# env:
# ZIP_EXCLUDE: -x ".*" -x "__MACOSX" -x "*.DS_Store"

# - name: Check Release notes
# run: |
# echo "-- Parsing Release Notes from CHANGELOG"
# ./.github/release-notes.sh ./CHANGELOG.md

# - name: Upload build artifact
# uses: actions/upload-artifact@v3
# with:
# name: ${{ steps.setup-artifact.outputs.spx_file_name }}.zip
# path: ${{ steps.setup-artifact.outputs.spx_file_name }}.zip

build-win:
# FIXME this hacky pipeline will be cleaned later
runs-on: windows-latest
steps:
- uses: actions/checkout@v3

# configure spx artifact name in next format:
# {php}-{ts}-{os.name}-{compiler}
# spx-php-8.1-nts-linux-gcc
- name: Set artifact name
id: setup-artifact
run: |
echo "spx_file_name=spx-php-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.compiler }}" >> $GITHUB_OUTPUT
- name: Build extension for Ubuntu and macOS
if: matrix.name != 'debian'
uses: ./.github/workflows/build-linux-mac-ext

- name: Build extension for Debian using docker
if: matrix.name == 'debian' && matrix.php != '5.4' && matrix.php != '5.5'
uses: ./.github/workflows/build-debian-ext

- name: Upload build artifacts after Failure
if: failure()
uses: actions/upload-artifact@v3
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
- name: Setup PHP SDK with Developer Pack
uses: zephir-lang/setup-php-sdk@fd5f1bce00956a7e8ac30faaa1ff0692d6dacdfb # v1.0
with:
name: debug-${{ steps.setup-artifact.outputs.spx_file_name }}
path: |
${{ github.workspace }}/*.log
${{ github.workspace }}/tests/*.log
retention-days: 7

- name: Create ZIP archive with build artifact
php_version: '8.3'
ts: 'nts'
msvc: 'vs16'
arch: 'x64'
install_dir: 'C:\tools'
cache_dir: 'C:\Temp'
- name: Clone PHP-src
run: |
zip -rvj ${{ steps.setup-artifact.outputs.spx_file_name }}.zip \
./modules/spx.so LICENSE $ZIP_EXCLUDE
zip -rv ${{ steps.setup-artifact.outputs.spx_file_name }}.zip \
./assets $ZIP_EXCLUDE
env:
ZIP_EXCLUDE: -x ".*" -x "__MACOSX" -x "*.DS_Store"

- name: Check Release notes
git clone https://github.com/php/php-src.git C:\php-src
- name: Copy SPX to PHP-src ext directory
run: |
echo "-- Parsing Release Notes from CHANGELOG"
./.github/release-notes.sh ./CHANGELOG.md
- name: Upload build artifact
uses: actions/upload-artifact@v3
with:
name: ${{ steps.setup-artifact.outputs.spx_file_name }}.zip
path: ${{ steps.setup-artifact.outputs.spx_file_name }}.zip

release:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')

needs: [ build ]
name: Create Release
runs-on: ubuntu-20.04

steps:
- name: Checkout Code
uses: actions/checkout@v3
with:
fetch-depth: 1

- name: Get the release version
id: get-version
xcopy /e /k /h /i . C:\php-src\ext\php-spx
- name: Configure and build 1
run: |
echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
- name: Download SPX build artifacts
id: download
uses: actions/download-artifact@v3
with:
path: ./build-artifacts

- name: Prepare Release notes
cd C:\php-src
./buildconf.bat
- name: Configure and build 2
run: |
echo "-- Creating Release Notes"
./.github/release-notes.sh ./CHANGELOG.md > ./release-notes.md
- name: Create Release
uses: ncipollo/release-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
name: ${{ steps.get-version.outputs.version }}
tag: ${{ steps.get-version.outputs.version }}
bodyFile: "./release-notes.md"
allowUpdates: true
artifacts: "./build-artifacts/*/*.zip"
artifactContentType: application/octet-stream
cd C:\php-src
./configure --help
./configure --disable-all --enable-cli --enable-spx
- name: Configure and build 3
run: |
cd C:\php-src
nmake
# release:
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')

# needs: [ build ]
# name: Create Release
# runs-on: ubuntu-20.04

# steps:
# - name: Checkout Code
# uses: actions/checkout@v3
# with:
# fetch-depth: 1

# - name: Get the release version
# id: get-version
# run: |
# echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT

# - name: Download SPX build artifacts
# id: download
# uses: actions/download-artifact@v3
# with:
# path: ./build-artifacts

# - name: Prepare Release notes
# run: |
# echo "-- Creating Release Notes"
# ./.github/release-notes.sh ./CHANGELOG.md > ./release-notes.md

# - name: Create Release
# uses: ncipollo/release-action@v1
# with:
# token: ${{ secrets.GITHUB_TOKEN }}
# name: ${{ steps.get-version.outputs.version }}
# tag: ${{ steps.get-version.outputs.version }}
# bodyFile: "./release-notes.md"
# allowUpdates: true
# artifacts: "./build-artifacts/*/*.zip"
# artifactContentType: application/octet-stream
40 changes: 40 additions & 0 deletions config.w32
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
ARG_ENABLE("spx", "Enable SPX extension", "no");

ARG_ENABLE("spx-dev", "Compile SPX with debugging symbols", "no");

if (PHP_SPX == "yes") {
//if (PHP_ZTS != "no"&& CONTINUOUS_INTEGRATION != "true") {
// AC_MSG_ERROR('SPX does not work with ZTS PHP build');
//}

AC_DEFINE("HAVE_SPX", 1, "spx");

ADD_FLAG("CFLAGS", "/Ze /WX /Wall /Ox /wd4820 /wd4774 /wd4711 /wd4710");
//if (CONTINUOUS_INTEGRATION == "true") {
// ADD_FLAG("CFLAGS", "-DCONTINUOUS_INTEGRATION");
//}

if (PHP_SPX_DEV == "yes") {
ADD_FLAG("CFLAGS", "/Zi");
}

EXTENSION("spx", "src/php_spx.c \
src/spx_profiler.c \
src/spx_profiler_tracer.c \
src/spx_profiler_sampler.c \
src/spx_reporter_full.c \
src/spx_reporter_fp.c \
src/spx_reporter_trace.c \
src/spx_metric.c \
src/spx_resource_stats.c \
src/spx_hmap.c \
src/spx_str_builder.c \
src/spx_output_stream.c \
src/spx_php.c \
src/spx_stdio.c \
src/spx_config.c \
src/spx_utils.c \
src/spx_fmt.c", true);

ADD_MAKEFILE_FRAGMENT();
}
8 changes: 4 additions & 4 deletions src/php_spx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_spx_profiler_stop, 0, 0, 0)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_spx_profiler_full_report_set_custom_metadata_str, 0, 0, 1)
#if PHP_API_VERSION >= 20151012
#if ZEND_MODULE_API_NO >= 20151012
ZEND_ARG_TYPE_INFO(0, customMetadataStr, IS_STRING, 0)
#else
ZEND_ARG_INFO(0, customMetadataStr)
Expand Down Expand Up @@ -437,7 +437,7 @@ static PHP_FUNCTION(spx_profiler_stop)
profiling_handler_stop();

if (context.profiling_handler.full_report_key[0]) {
#if PHP_API_VERSION >= 20151012
#if ZEND_MODULE_API_NO >= 20151012
RETURN_STRING(context.profiling_handler.full_report_key);
#else
RETURN_STRING(context.profiling_handler.full_report_key, 1);
Expand All @@ -448,13 +448,13 @@ static PHP_FUNCTION(spx_profiler_stop)
static PHP_FUNCTION(spx_profiler_full_report_set_custom_metadata_str)
{
char * custom_metadata_str;
#if PHP_API_VERSION >= 20151012
#if ZEND_MODULE_API_NO >= 20151012
size_t custom_metadata_str_len;
#else
int custom_metadata_str_len;
#endif

#if PHP_API_VERSION >= 20170718
#if ZEND_MODULE_API_NO >= 20170718
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_STRING(custom_metadata_str, custom_metadata_str_len)
ZEND_PARSE_PARAMETERS_END();
Expand Down
16 changes: 15 additions & 1 deletion src/spx_fmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,21 +190,35 @@ void spx_fmt_row_print(const spx_fmt_row_t * row, spx_output_stream_t * output)
;

if (row->cells[i].ansi_fmt) {
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable: 4129)
#endif
spx_output_stream_printf(output, "\e[%sm", row->cells[i].ansi_fmt);
#ifdef _WIN32
#pragma warning(pop)
#endif
}

snprintf(
format,
sizeof(format),
"%%-%lu.%lus",
"%%-%zu.%zus",
cell_width,
cell_width
);

spx_output_stream_printf(output, format, text);

if (row->cells[i].ansi_fmt) {
#ifdef _WIN32
# pragma warning(push)
# pragma warning(disable: 4129)
#endif
spx_output_stream_print(output, "\e[0m");
#ifdef _WIN32
# pragma warning(pop)
#endif
}

spx_output_stream_print(output, " |");
Expand Down
Loading

0 comments on commit 38263ad

Please sign in to comment.