zend_call_stack sort of GH-13358 follow-up. - #13368

Merged
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2
Feb 16, 2024
Merged

zend_call_stack sort of GH-13358 follow-up.#13368
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2

Conversation

@devnexen

Copy link
Copy Markdown
Member

for threaded context, it solely uses a new api only available on illumos.
Here using a common older api to get the stack info for the current thread.
while at it, completing stack_limit_010 test for these platforms.

@devnexen

Copy link
Copy Markdown
MemberAuthor

@petk if you have a moment would it be possible to test if it builds for you on your solaris machines and passing the tests (including stack_limit_010.phpt which needs STACK_LIMIT_DEFAULTS_CHECK env var) ? thanks in advance.

@petk

petk commented Feb 10, 2024

Copy link
Copy Markdown
Member

This test fails specifically. Actually it failed also before, I just didn't notice it.

With the patch from the pull request it does look better a bit:

Zend/tests/stack_limit/stack_limit_010.diff:

--
}
Expected max_size: 0x%x
Actual max_size: 0x%x
013- bool(true)
013+ bool(false)

Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Expected max_size: 0xa00000
Actual max_size: 0x800000

Without patch (as is the current master branch) - Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Fatal error: Uncaught UnhandledMatchError: Unhandled match case 'SunOS' in .../php-src/Zend/tests/stack_limit/stack_limit_010.php:7
Stack trace:
#0 {main}
thrown in .../php-src/Zend/tests/stack_limit/stack_limit_010.php on line 7

I'm not sure if we should bother too much about Solaris 11.4 here. On Solaris there will be no more upgrades with new features. Only backwards compatibility and maintenance patches of existing applications until 2037. I think nobody will adjust new software for Solaris 11.4 specifically anymore because that would mean a dead end for the software itself. If there are patches possible, sure. I think looking forward to Oracle Linux and Solaris-alike illumos systems is the way forward here.

Realistically, I'm not sure PHP 8.2 version will be available at all on Solaris at any point in the future, let alone 8.4.

Regarding the patch in the PR, I think we can add it and go from there.

P.S.: All other Zend tests pass, otherwise.

@devnexen

Copy link
Copy Markdown
MemberAuthor

ah the stack is smaller on solaris.
well I thought of this PR because someone posted a build fix for solaris 10 just few months ago. Which means newer versions of PHP might come from third party repositories.

@divinity76

Copy link
Copy Markdown
Contributor

Is Oracle Solaris a supported platform?

@devnexen

Copy link
Copy Markdown
MemberAuthor

Not a top supported platform, more like a lower tier one ; couple of other major oss projects still support it too. As I mentioned above at least one person cared enough to report a build issue for solaris 10.

Comment threadZend/zend_call_stack.c Outdated
Comment on lines 675 to 676

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack (see the diagram in zend_call_stack_get_linux_proc_maps), and ss_sp is the high address already according to the manpage so I think we shouldn't subtract stack->max_size from it here.

Note that in tests, zend_call_stack_get_solaris will use zend_call_stack_get_solaris_proc_maps and not zend_call_stack_get_solaris_pthread because we are the main thread.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack

ah true I forgot.

for threaded context, it solely uses a new api only available on
illumos.
Here using a common older api to get the stack info for the current
thread.
while at it, completing stack_limit_010 test for these platforms.
@devnexen
devnexenforce-pushed the zend_call_stack_solaris_upd2 branch from a054542 to 21c653eCompareFebruary 16, 2024 13:13

@arnaud-lbarnaud-lb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@devnexen
devnexen merged commit eaaffae into php:masterFeb 16, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@devnexen@petk@divinity76@arnaud-lb
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

zend_call_stack sort of GH-13358 follow-up. - #13368

Merged
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2
Feb 16, 2024
Merged

zend_call_stack sort of GH-13358 follow-up.#13368
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2

Conversation

@devnexen

Copy link
Copy Markdown
Member

for threaded context, it solely uses a new api only available on illumos.
Here using a common older api to get the stack info for the current thread.
while at it, completing stack_limit_010 test for these platforms.

@devnexen

Copy link
Copy Markdown
MemberAuthor

@petk if you have a moment would it be possible to test if it builds for you on your solaris machines and passing the tests (including stack_limit_010.phpt which needs STACK_LIMIT_DEFAULTS_CHECK env var) ? thanks in advance.

@petk

petk commented Feb 10, 2024

Copy link
Copy Markdown
Member

This test fails specifically. Actually it failed also before, I just didn't notice it.

With the patch from the pull request it does look better a bit:

Zend/tests/stack_limit/stack_limit_010.diff:

--
}
Expected max_size: 0x%x
Actual max_size: 0x%x
013- bool(true)
013+ bool(false)

Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Expected max_size: 0xa00000
Actual max_size: 0x800000

Without patch (as is the current master branch) - Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Fatal error: Uncaught UnhandledMatchError: Unhandled match case 'SunOS' in .../php-src/Zend/tests/stack_limit/stack_limit_010.php:7
Stack trace:
#0 {main}
thrown in .../php-src/Zend/tests/stack_limit/stack_limit_010.php on line 7

I'm not sure if we should bother too much about Solaris 11.4 here. On Solaris there will be no more upgrades with new features. Only backwards compatibility and maintenance patches of existing applications until 2037. I think nobody will adjust new software for Solaris 11.4 specifically anymore because that would mean a dead end for the software itself. If there are patches possible, sure. I think looking forward to Oracle Linux and Solaris-alike illumos systems is the way forward here.

Realistically, I'm not sure PHP 8.2 version will be available at all on Solaris at any point in the future, let alone 8.4.

Regarding the patch in the PR, I think we can add it and go from there.

P.S.: All other Zend tests pass, otherwise.

@devnexen

Copy link
Copy Markdown
MemberAuthor

ah the stack is smaller on solaris.
well I thought of this PR because someone posted a build fix for solaris 10 just few months ago. Which means newer versions of PHP might come from third party repositories.

@divinity76

Copy link
Copy Markdown
Contributor

Is Oracle Solaris a supported platform?

@devnexen

Copy link
Copy Markdown
MemberAuthor

Not a top supported platform, more like a lower tier one ; couple of other major oss projects still support it too. As I mentioned above at least one person cared enough to report a build issue for solaris 10.

Comment threadZend/zend_call_stack.c Outdated
Comment on lines 675 to 676

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack (see the diagram in zend_call_stack_get_linux_proc_maps), and ss_sp is the high address already according to the manpage so I think we shouldn't subtract stack->max_size from it here.

Note that in tests, zend_call_stack_get_solaris will use zend_call_stack_get_solaris_proc_maps and not zend_call_stack_get_solaris_pthread because we are the main thread.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack

ah true I forgot.

for threaded context, it solely uses a new api only available on
illumos.
Here using a common older api to get the stack info for the current
thread.
while at it, completing stack_limit_010 test for these platforms.
@devnexen
devnexenforce-pushed the zend_call_stack_solaris_upd2 branch from a054542 to 21c653eCompareFebruary 16, 2024 13:13

@arnaud-lbarnaud-lb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@devnexen
devnexen merged commit eaaffae into php:masterFeb 16, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@devnexen@petk@divinity76@arnaud-lb
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

zend_call_stack sort of GH-13358 follow-up. - #13368

Merged
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2
Feb 16, 2024
Merged

zend_call_stack sort of GH-13358 follow-up.#13368
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2

Conversation

@devnexen

Copy link
Copy Markdown
Member

for threaded context, it solely uses a new api only available on illumos.
Here using a common older api to get the stack info for the current thread.
while at it, completing stack_limit_010 test for these platforms.

@devnexen

Copy link
Copy Markdown
MemberAuthor

@petk if you have a moment would it be possible to test if it builds for you on your solaris machines and passing the tests (including stack_limit_010.phpt which needs STACK_LIMIT_DEFAULTS_CHECK env var) ? thanks in advance.

@petk

petk commented Feb 10, 2024

Copy link
Copy Markdown
Member

This test fails specifically. Actually it failed also before, I just didn't notice it.

With the patch from the pull request it does look better a bit:

Zend/tests/stack_limit/stack_limit_010.diff:

--
}
Expected max_size: 0x%x
Actual max_size: 0x%x
013- bool(true)
013+ bool(false)

Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Expected max_size: 0xa00000
Actual max_size: 0x800000

Without patch (as is the current master branch) - Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Fatal error: Uncaught UnhandledMatchError: Unhandled match case 'SunOS' in .../php-src/Zend/tests/stack_limit/stack_limit_010.php:7
Stack trace:
#0 {main}
thrown in .../php-src/Zend/tests/stack_limit/stack_limit_010.php on line 7

I'm not sure if we should bother too much about Solaris 11.4 here. On Solaris there will be no more upgrades with new features. Only backwards compatibility and maintenance patches of existing applications until 2037. I think nobody will adjust new software for Solaris 11.4 specifically anymore because that would mean a dead end for the software itself. If there are patches possible, sure. I think looking forward to Oracle Linux and Solaris-alike illumos systems is the way forward here.

Realistically, I'm not sure PHP 8.2 version will be available at all on Solaris at any point in the future, let alone 8.4.

Regarding the patch in the PR, I think we can add it and go from there.

P.S.: All other Zend tests pass, otherwise.

@devnexen

Copy link
Copy Markdown
MemberAuthor

ah the stack is smaller on solaris.
well I thought of this PR because someone posted a build fix for solaris 10 just few months ago. Which means newer versions of PHP might come from third party repositories.

@divinity76

Copy link
Copy Markdown
Contributor

Is Oracle Solaris a supported platform?

@devnexen

Copy link
Copy Markdown
MemberAuthor

Not a top supported platform, more like a lower tier one ; couple of other major oss projects still support it too. As I mentioned above at least one person cared enough to report a build issue for solaris 10.

Comment threadZend/zend_call_stack.c Outdated
Comment on lines 675 to 676

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack (see the diagram in zend_call_stack_get_linux_proc_maps), and ss_sp is the high address already according to the manpage so I think we shouldn't subtract stack->max_size from it here.

Note that in tests, zend_call_stack_get_solaris will use zend_call_stack_get_solaris_proc_maps and not zend_call_stack_get_solaris_pthread because we are the main thread.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack

ah true I forgot.

for threaded context, it solely uses a new api only available on
illumos.
Here using a common older api to get the stack info for the current
thread.
while at it, completing stack_limit_010 test for these platforms.
@devnexen
devnexenforce-pushed the zend_call_stack_solaris_upd2 branch from a054542 to 21c653eCompareFebruary 16, 2024 13:13

@arnaud-lbarnaud-lb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@devnexen
devnexen merged commit eaaffae into php:masterFeb 16, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@devnexen@petk@divinity76@arnaud-lb
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

zend_call_stack sort of GH-13358 follow-up. - #13368

Merged
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2
Feb 16, 2024
Merged

zend_call_stack sort of GH-13358 follow-up.#13368
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2

Conversation

@devnexen

Copy link
Copy Markdown
Member

for threaded context, it solely uses a new api only available on illumos.
Here using a common older api to get the stack info for the current thread.
while at it, completing stack_limit_010 test for these platforms.

@devnexen

Copy link
Copy Markdown
MemberAuthor

@petk if you have a moment would it be possible to test if it builds for you on your solaris machines and passing the tests (including stack_limit_010.phpt which needs STACK_LIMIT_DEFAULTS_CHECK env var) ? thanks in advance.

@petk

petk commented Feb 10, 2024

Copy link
Copy Markdown
Member

This test fails specifically. Actually it failed also before, I just didn't notice it.

With the patch from the pull request it does look better a bit:

Zend/tests/stack_limit/stack_limit_010.diff:

--
}
Expected max_size: 0x%x
Actual max_size: 0x%x
013- bool(true)
013+ bool(false)

Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Expected max_size: 0xa00000
Actual max_size: 0x800000

Without patch (as is the current master branch) - Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Fatal error: Uncaught UnhandledMatchError: Unhandled match case 'SunOS' in .../php-src/Zend/tests/stack_limit/stack_limit_010.php:7
Stack trace:
#0 {main}
thrown in .../php-src/Zend/tests/stack_limit/stack_limit_010.php on line 7

I'm not sure if we should bother too much about Solaris 11.4 here. On Solaris there will be no more upgrades with new features. Only backwards compatibility and maintenance patches of existing applications until 2037. I think nobody will adjust new software for Solaris 11.4 specifically anymore because that would mean a dead end for the software itself. If there are patches possible, sure. I think looking forward to Oracle Linux and Solaris-alike illumos systems is the way forward here.

Realistically, I'm not sure PHP 8.2 version will be available at all on Solaris at any point in the future, let alone 8.4.

Regarding the patch in the PR, I think we can add it and go from there.

P.S.: All other Zend tests pass, otherwise.

@devnexen

Copy link
Copy Markdown
MemberAuthor

ah the stack is smaller on solaris.
well I thought of this PR because someone posted a build fix for solaris 10 just few months ago. Which means newer versions of PHP might come from third party repositories.

@divinity76

Copy link
Copy Markdown
Contributor

Is Oracle Solaris a supported platform?

@devnexen

Copy link
Copy Markdown
MemberAuthor

Not a top supported platform, more like a lower tier one ; couple of other major oss projects still support it too. As I mentioned above at least one person cared enough to report a build issue for solaris 10.

Comment threadZend/zend_call_stack.c Outdated
Comment on lines 675 to 676

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack (see the diagram in zend_call_stack_get_linux_proc_maps), and ss_sp is the high address already according to the manpage so I think we shouldn't subtract stack->max_size from it here.

Note that in tests, zend_call_stack_get_solaris will use zend_call_stack_get_solaris_proc_maps and not zend_call_stack_get_solaris_pthread because we are the main thread.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack

ah true I forgot.

for threaded context, it solely uses a new api only available on
illumos.
Here using a common older api to get the stack info for the current
thread.
while at it, completing stack_limit_010 test for these platforms.
@devnexen
devnexenforce-pushed the zend_call_stack_solaris_upd2 branch from a054542 to 21c653eCompareFebruary 16, 2024 13:13

@arnaud-lbarnaud-lb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@devnexen
devnexen merged commit eaaffae into php:masterFeb 16, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@devnexen@petk@divinity76@arnaud-lb
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

zend_call_stack sort of GH-13358 follow-up. - #13368

Merged
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2
Feb 16, 2024
Merged

zend_call_stack sort of GH-13358 follow-up.#13368
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2

Conversation

@devnexen

Copy link
Copy Markdown
Member

for threaded context, it solely uses a new api only available on illumos.
Here using a common older api to get the stack info for the current thread.
while at it, completing stack_limit_010 test for these platforms.

@devnexen

Copy link
Copy Markdown
MemberAuthor

@petk if you have a moment would it be possible to test if it builds for you on your solaris machines and passing the tests (including stack_limit_010.phpt which needs STACK_LIMIT_DEFAULTS_CHECK env var) ? thanks in advance.

@petk

petk commented Feb 10, 2024

Copy link
Copy Markdown
Member

This test fails specifically. Actually it failed also before, I just didn't notice it.

With the patch from the pull request it does look better a bit:

Zend/tests/stack_limit/stack_limit_010.diff:

--
}
Expected max_size: 0x%x
Actual max_size: 0x%x
013- bool(true)
013+ bool(false)

Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Expected max_size: 0xa00000
Actual max_size: 0x800000

Without patch (as is the current master branch) - Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Fatal error: Uncaught UnhandledMatchError: Unhandled match case 'SunOS' in .../php-src/Zend/tests/stack_limit/stack_limit_010.php:7
Stack trace:
#0 {main}
thrown in .../php-src/Zend/tests/stack_limit/stack_limit_010.php on line 7

I'm not sure if we should bother too much about Solaris 11.4 here. On Solaris there will be no more upgrades with new features. Only backwards compatibility and maintenance patches of existing applications until 2037. I think nobody will adjust new software for Solaris 11.4 specifically anymore because that would mean a dead end for the software itself. If there are patches possible, sure. I think looking forward to Oracle Linux and Solaris-alike illumos systems is the way forward here.

Realistically, I'm not sure PHP 8.2 version will be available at all on Solaris at any point in the future, let alone 8.4.

Regarding the patch in the PR, I think we can add it and go from there.

P.S.: All other Zend tests pass, otherwise.

@devnexen

Copy link
Copy Markdown
MemberAuthor

ah the stack is smaller on solaris.
well I thought of this PR because someone posted a build fix for solaris 10 just few months ago. Which means newer versions of PHP might come from third party repositories.

@divinity76

Copy link
Copy Markdown
Contributor

Is Oracle Solaris a supported platform?

@devnexen

Copy link
Copy Markdown
MemberAuthor

Not a top supported platform, more like a lower tier one ; couple of other major oss projects still support it too. As I mentioned above at least one person cared enough to report a build issue for solaris 10.

Comment threadZend/zend_call_stack.c Outdated
Comment on lines 675 to 676

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack (see the diagram in zend_call_stack_get_linux_proc_maps), and ss_sp is the high address already according to the manpage so I think we shouldn't subtract stack->max_size from it here.

Note that in tests, zend_call_stack_get_solaris will use zend_call_stack_get_solaris_proc_maps and not zend_call_stack_get_solaris_pthread because we are the main thread.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack

ah true I forgot.

for threaded context, it solely uses a new api only available on
illumos.
Here using a common older api to get the stack info for the current
thread.
while at it, completing stack_limit_010 test for these platforms.
@devnexen
devnexenforce-pushed the zend_call_stack_solaris_upd2 branch from a054542 to 21c653eCompareFebruary 16, 2024 13:13

@arnaud-lbarnaud-lb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@devnexen
devnexen merged commit eaaffae into php:masterFeb 16, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@devnexen@petk@divinity76@arnaud-lb
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

zend_call_stack sort of GH-13358 follow-up. - #13368

Merged
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2
Feb 16, 2024
Merged

zend_call_stack sort of GH-13358 follow-up.#13368
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2

Conversation

@devnexen

Copy link
Copy Markdown
Member

for threaded context, it solely uses a new api only available on illumos.
Here using a common older api to get the stack info for the current thread.
while at it, completing stack_limit_010 test for these platforms.

@devnexen

Copy link
Copy Markdown
MemberAuthor

@petk if you have a moment would it be possible to test if it builds for you on your solaris machines and passing the tests (including stack_limit_010.phpt which needs STACK_LIMIT_DEFAULTS_CHECK env var) ? thanks in advance.

@petk

petk commented Feb 10, 2024

Copy link
Copy Markdown
Member

This test fails specifically. Actually it failed also before, I just didn't notice it.

With the patch from the pull request it does look better a bit:

Zend/tests/stack_limit/stack_limit_010.diff:

--
}
Expected max_size: 0x%x
Actual max_size: 0x%x
013- bool(true)
013+ bool(false)

Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Expected max_size: 0xa00000
Actual max_size: 0x800000

Without patch (as is the current master branch) - Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Fatal error: Uncaught UnhandledMatchError: Unhandled match case 'SunOS' in .../php-src/Zend/tests/stack_limit/stack_limit_010.php:7
Stack trace:
#0 {main}
thrown in .../php-src/Zend/tests/stack_limit/stack_limit_010.php on line 7

I'm not sure if we should bother too much about Solaris 11.4 here. On Solaris there will be no more upgrades with new features. Only backwards compatibility and maintenance patches of existing applications until 2037. I think nobody will adjust new software for Solaris 11.4 specifically anymore because that would mean a dead end for the software itself. If there are patches possible, sure. I think looking forward to Oracle Linux and Solaris-alike illumos systems is the way forward here.

Realistically, I'm not sure PHP 8.2 version will be available at all on Solaris at any point in the future, let alone 8.4.

Regarding the patch in the PR, I think we can add it and go from there.

P.S.: All other Zend tests pass, otherwise.

@devnexen

Copy link
Copy Markdown
MemberAuthor

ah the stack is smaller on solaris.
well I thought of this PR because someone posted a build fix for solaris 10 just few months ago. Which means newer versions of PHP might come from third party repositories.

@divinity76

Copy link
Copy Markdown
Contributor

Is Oracle Solaris a supported platform?

@devnexen

Copy link
Copy Markdown
MemberAuthor

Not a top supported platform, more like a lower tier one ; couple of other major oss projects still support it too. As I mentioned above at least one person cared enough to report a build issue for solaris 10.

Comment threadZend/zend_call_stack.c Outdated
Comment on lines 675 to 676

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack (see the diagram in zend_call_stack_get_linux_proc_maps), and ss_sp is the high address already according to the manpage so I think we shouldn't subtract stack->max_size from it here.

Note that in tests, zend_call_stack_get_solaris will use zend_call_stack_get_solaris_proc_maps and not zend_call_stack_get_solaris_pthread because we are the main thread.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack

ah true I forgot.

for threaded context, it solely uses a new api only available on
illumos.
Here using a common older api to get the stack info for the current
thread.
while at it, completing stack_limit_010 test for these platforms.
@devnexen
devnexenforce-pushed the zend_call_stack_solaris_upd2 branch from a054542 to 21c653eCompareFebruary 16, 2024 13:13

@arnaud-lbarnaud-lb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@devnexen
devnexen merged commit eaaffae into php:masterFeb 16, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@devnexen@petk@divinity76@arnaud-lb
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

zend_call_stack sort of GH-13358 follow-up. - #13368

Merged
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2
Feb 16, 2024
Merged

zend_call_stack sort of GH-13358 follow-up.#13368
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2

Conversation

@devnexen

Copy link
Copy Markdown
Member

for threaded context, it solely uses a new api only available on illumos.
Here using a common older api to get the stack info for the current thread.
while at it, completing stack_limit_010 test for these platforms.

@devnexen

Copy link
Copy Markdown
MemberAuthor

@petk if you have a moment would it be possible to test if it builds for you on your solaris machines and passing the tests (including stack_limit_010.phpt which needs STACK_LIMIT_DEFAULTS_CHECK env var) ? thanks in advance.

@petk

petk commented Feb 10, 2024

Copy link
Copy Markdown
Member

This test fails specifically. Actually it failed also before, I just didn't notice it.

With the patch from the pull request it does look better a bit:

Zend/tests/stack_limit/stack_limit_010.diff:

--
}
Expected max_size: 0x%x
Actual max_size: 0x%x
013- bool(true)
013+ bool(false)

Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Expected max_size: 0xa00000
Actual max_size: 0x800000

Without patch (as is the current master branch) - Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Fatal error: Uncaught UnhandledMatchError: Unhandled match case 'SunOS' in .../php-src/Zend/tests/stack_limit/stack_limit_010.php:7
Stack trace:
#0 {main}
thrown in .../php-src/Zend/tests/stack_limit/stack_limit_010.php on line 7

I'm not sure if we should bother too much about Solaris 11.4 here. On Solaris there will be no more upgrades with new features. Only backwards compatibility and maintenance patches of existing applications until 2037. I think nobody will adjust new software for Solaris 11.4 specifically anymore because that would mean a dead end for the software itself. If there are patches possible, sure. I think looking forward to Oracle Linux and Solaris-alike illumos systems is the way forward here.

Realistically, I'm not sure PHP 8.2 version will be available at all on Solaris at any point in the future, let alone 8.4.

Regarding the patch in the PR, I think we can add it and go from there.

P.S.: All other Zend tests pass, otherwise.

@devnexen

Copy link
Copy Markdown
MemberAuthor

ah the stack is smaller on solaris.
well I thought of this PR because someone posted a build fix for solaris 10 just few months ago. Which means newer versions of PHP might come from third party repositories.

@divinity76

Copy link
Copy Markdown
Contributor

Is Oracle Solaris a supported platform?

@devnexen

Copy link
Copy Markdown
MemberAuthor

Not a top supported platform, more like a lower tier one ; couple of other major oss projects still support it too. As I mentioned above at least one person cared enough to report a build issue for solaris 10.

Comment threadZend/zend_call_stack.c Outdated
Comment on lines 675 to 676

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack (see the diagram in zend_call_stack_get_linux_proc_maps), and ss_sp is the high address already according to the manpage so I think we shouldn't subtract stack->max_size from it here.

Note that in tests, zend_call_stack_get_solaris will use zend_call_stack_get_solaris_proc_maps and not zend_call_stack_get_solaris_pthread because we are the main thread.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack

ah true I forgot.

for threaded context, it solely uses a new api only available on
illumos.
Here using a common older api to get the stack info for the current
thread.
while at it, completing stack_limit_010 test for these platforms.
@devnexen
devnexenforce-pushed the zend_call_stack_solaris_upd2 branch from a054542 to 21c653eCompareFebruary 16, 2024 13:13

@arnaud-lbarnaud-lb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@devnexen
devnexen merged commit eaaffae into php:masterFeb 16, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@devnexen@petk@divinity76@arnaud-lb
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

zend_call_stack sort of GH-13358 follow-up. - #13368

Merged
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2
Feb 16, 2024
Merged

zend_call_stack sort of GH-13358 follow-up.#13368
devnexen merged 1 commit into
php:masterfrom
devnexen:zend_call_stack_solaris_upd2

Conversation

@devnexen

Copy link
Copy Markdown
Member

for threaded context, it solely uses a new api only available on illumos.
Here using a common older api to get the stack info for the current thread.
while at it, completing stack_limit_010 test for these platforms.

@devnexen

Copy link
Copy Markdown
MemberAuthor

@petk if you have a moment would it be possible to test if it builds for you on your solaris machines and passing the tests (including stack_limit_010.phpt which needs STACK_LIMIT_DEFAULTS_CHECK env var) ? thanks in advance.

@petk

petk commented Feb 10, 2024

Copy link
Copy Markdown
Member

This test fails specifically. Actually it failed also before, I just didn't notice it.

With the patch from the pull request it does look better a bit:

Zend/tests/stack_limit/stack_limit_010.diff:

--
}
Expected max_size: 0x%x
Actual max_size: 0x%x
013- bool(true)
013+ bool(false)

Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Expected max_size: 0xa00000
Actual max_size: 0x800000

Without patch (as is the current master branch) - Zend/tests/stack_limit/stack_limit_010.out:

array(4) {
["base"]=>
string(14) "0x7fffc0000000"
["max_size"]=>
string(8) "0x800000"
["position"]=>
string(14) "0x7fffbfffc120"
["EG(stack_limit)"]=>
string(14) "0x7fffbf80c000"
}
Fatal error: Uncaught UnhandledMatchError: Unhandled match case 'SunOS' in .../php-src/Zend/tests/stack_limit/stack_limit_010.php:7
Stack trace:
#0 {main}
thrown in .../php-src/Zend/tests/stack_limit/stack_limit_010.php on line 7

I'm not sure if we should bother too much about Solaris 11.4 here. On Solaris there will be no more upgrades with new features. Only backwards compatibility and maintenance patches of existing applications until 2037. I think nobody will adjust new software for Solaris 11.4 specifically anymore because that would mean a dead end for the software itself. If there are patches possible, sure. I think looking forward to Oracle Linux and Solaris-alike illumos systems is the way forward here.

Realistically, I'm not sure PHP 8.2 version will be available at all on Solaris at any point in the future, let alone 8.4.

Regarding the patch in the PR, I think we can add it and go from there.

P.S.: All other Zend tests pass, otherwise.

@devnexen

Copy link
Copy Markdown
MemberAuthor

ah the stack is smaller on solaris.
well I thought of this PR because someone posted a build fix for solaris 10 just few months ago. Which means newer versions of PHP might come from third party repositories.

@divinity76

Copy link
Copy Markdown
Contributor

Is Oracle Solaris a supported platform?

@devnexen

Copy link
Copy Markdown
MemberAuthor

Not a top supported platform, more like a lower tier one ; couple of other major oss projects still support it too. As I mentioned above at least one person cared enough to report a build issue for solaris 10.

Comment threadZend/zend_call_stack.c Outdated
Comment on lines 675 to 676

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack (see the diagram in zend_call_stack_get_linux_proc_maps), and ss_sp is the high address already according to the manpage so I think we shouldn't subtract stack->max_size from it here.

Note that in tests, zend_call_stack_get_solaris will use zend_call_stack_get_solaris_proc_maps and not zend_call_stack_get_solaris_pthread because we are the main thread.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

stack->base should be the high address of the stack

ah true I forgot.

for threaded context, it solely uses a new api only available on
illumos.
Here using a common older api to get the stack info for the current
thread.
while at it, completing stack_limit_010 test for these platforms.
@devnexen
devnexenforce-pushed the zend_call_stack_solaris_upd2 branch from a054542 to 21c653eCompareFebruary 16, 2024 13:13

@arnaud-lbarnaud-lb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@devnexen
devnexen merged commit eaaffae into php:masterFeb 16, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@devnexen@petk@divinity76@arnaud-lb