search

preinheimer / xhprof

XHGUI is a GUI for the XHProf PHP extension, using a database backend, and pretty graphs to make it easy to use and interpret.
Other
834 stars 185 forks source link

Upgrade from Facebook master #60

Closed dlsniper closed 9 years ago

dlsniper commented 11 years ago

Hello,

Would a code merge from master branch at Facebook be possible to get the latest patches from there?

Thanks.

Jan-E commented 11 years ago

For instance merge the patch for PHP 5.5: https://github.com/facebook/xhprof/commit/2050461e64cf018733ee36641cb082d14931ae63.patch

You will have to do 2 out of 12 hunks by hand, but this is an easy job.

preinheimer commented 11 years ago

I think my preference would be to remove the actual extension from this repo. Clearly there's no attempt to better it here (only the UI for interacting with its data), best case scenario this code is up to date. Average case it's behind by a few commits.

Jan-E commented 11 years ago

That would be a pity, because AFAIK it is the only place where the sources of a Windows version are available. Except from the clickalicious fork, but you seem to be working together.

Builds are available at http://dev.freshsite.pl/php-extensions/xhprof.html but no sources.

And besides that, there are almost no commits in the original extension: https://github.com/facebook/xhprof/commits/master/extension The 'Reset the zend_compile_string function on stop' commit is already in your code.

preinheimer commented 11 years ago

Thanks for the heads up. I'd really viewed that code as redundant rather than useful. I've got Confoo this week, but I'll try to find some time to merge some patches as soon as I can.

Jan-E commented 11 years ago

Try this one: http://x32.elijst.nl/xhprof.zip It contains a config.w32 with a little x64 tweak.

It compiles under PHP 5.5.0alpha 5 in x86 and x64 mode. The TS builds: http://dl.dropbox.com/u/8954372/php-5.5.0alpha5-Win32-VC9-x64.zip http://dl.dropbox.com/u/8954372/php-5.5.0alpha5-Win32-VC9-x86.zip

I did not test it yet, but if you want to: go ahead.

preinheimer commented 11 years ago

I'm working on fixing up my environment so I can test these properly and merge