|
View:
New views
16 Messages
—
Rating Filter:
Alert me
|
|
|
Apache::SizeLimit + solaris Update 10There was a thread today on the users list where a guy was running into
problems with SizeLimit on Solaris update 10 [1]. Attached are 2 patches, one against the version of Apache2::SizeLimit in the 2.04 distribution, and the other against the version in SVN. the SVN version still tests fine on linux, but I can't test it on solaris at home, and the solaris boxes I do have access to don't have update 10 on them. I'm also not sure if what I did is acceptable or not, but it should work, I think. I also didn't make the change in the 1.3 tree. Adam [1] http://marc.info/?t=123630641100001&r=1&w=2 --- SizeLimit.pm.orig 2009-03-06 01:19:31.000000000 -0500 +++ SizeLimit.pm 2009-03-06 01:22:22.000000000 -0500 @@ -52,7 +52,8 @@ if Apache2::MPM->is_threaded(); # decide at compile time how to check for a process' memory size. - if (SOLARIS && $Config{'osvers'} >= 2.6) { + my ($major,$minor) = split('.',$Config{'osvers'}); + if (SOLARIS && $major >= 2 && $minor >= 6) { $HOW_BIG_IS_IT = \&solaris_2_6_size_check; Index: lib/Apache/SizeLimit/Core.pm =================================================================== --- lib/Apache/SizeLimit/Core.pm (revision 750777) +++ lib/Apache/SizeLimit/Core.pm (working copy) @@ -131,7 +131,8 @@ } BEGIN { - if ($Config{'osname'} eq 'solaris' && $Config{'osvers'} >= 2.6 ) { + my ($major,$minor) = split('.',$Config{'osvers'}); + if ($Config{'osname'} eq 'solaris' && $major >= 2 && $minor >= 6 ) { *_platform_check_size = \&_solaris_2_6_size_check; *_platform_getppid = \&_perl_getppid; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10As soon as a got in bed last night i realized the conditional logic in
the original patches was wrong, corrected versions are attached. Adam Adam Prime wrote: > There was a thread today on the users list where a guy was running into > problems with SizeLimit on Solaris update 10 [1]. Attached are 2 > patches, one against the version of Apache2::SizeLimit in the 2.04 > distribution, and the other against the version in SVN. the SVN version > still tests fine on linux, but I can't test it on solaris at home, and > the solaris boxes I do have access to don't have update 10 on them. > > I'm also not sure if what I did is acceptable or not, but it should > work, I think. I also didn't make the change in the 1.3 tree. > > Adam > > [1] http://marc.info/?t=123630641100001&r=1&w=2 > > > ------------------------------------------------------------------------ > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@... > For additional commands, e-mail: dev-help@... Index: Core.pm =================================================================== --- Core.pm (revision 750777) +++ Core.pm (working copy) @@ -131,7 +131,8 @@ } BEGIN { - if ($Config{'osname'} eq 'solaris' && $Config{'osvers'} >= 2.6 ) { + my ($major,$minor) = split('.',$Config{'osvers'}); + if ($Config{'osname'} eq 'solaris' && ($major > 2 || $major == 2 && $minor >= 6)) { *_platform_check_size = \&_solaris_2_6_size_check; *_platform_getppid = \&_perl_getppid; } --- SizeLimit.pm.orig 2009-03-06 01:19:31.000000000 -0500 +++ SizeLimit.pm 2009-03-06 08:54:24.000000000 -0500 @@ -52,7 +52,8 @@ if Apache2::MPM->is_threaded(); # decide at compile time how to check for a process' memory size. - if (SOLARIS && $Config{'osvers'} >= 2.6) { + my ($major,$minor) = split('.',$Config{'osvers'}); + if (SOLARIS && ($major > 2 || $major == 2 && $minor >= 6)) { $HOW_BIG_IS_IT = \&solaris_2_6_size_check; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10Third time's a charm right?
Patches revised again. The svn patch has now actually been tested on solaris with osvers of 2.10, and all the tests pass. waiting 60 seconds for server to start: ok (waited 2 secs) server localhost:8529 started t/apache/all......................skipped: (no reason given) t/apache2/basic...................ok t/apache2/check_n_requests2.......ok t/apache2/deprecated..............ok t/apache2/zzz_check_n_requests....ok t/pod.............................ok All tests successful. Files=6, Tests=18, 8 wallclock secs ( 0.04 usr 0.04 sys + 1.50 cusr 0.31 csys = 1.89 CPU) Result: PASS # perl -V Summary of my perl5 (revision 5 version 8 subversion 8) configuration: Platform: osname=solaris, osvers=2.10, archname=i86pc-solaris uname='sunos fxbuild-i386 5.10 generic_127112-11 i86pc i386 i86pc solaris ' config_args='-Dcc=gcc -Dprefix=/oanda/system' hint=recommended, useposix=true, d_sigaction=define usethreads=undef use5005threads=undef useithreads=undef usemultiplicity=undef useperlio=define d_sfio=undef uselargefiles=define usesocks=undef use64bitint=undef use64bitall=undef uselongdouble=undef usemymalloc=n, bincompat5005=undef Adam Adam Prime wrote: > As soon as a got in bed last night i realized the conditional logic in > the original patches was wrong, corrected versions are attached. > > Adam > > > Adam Prime wrote: >> There was a thread today on the users list where a guy was running into >> problems with SizeLimit on Solaris update 10 [1]. Attached are 2 >> patches, one against the version of Apache2::SizeLimit in the 2.04 >> distribution, and the other against the version in SVN. the SVN version >> still tests fine on linux, but I can't test it on solaris at home, and >> the solaris boxes I do have access to don't have update 10 on them. >> >> I'm also not sure if what I did is acceptable or not, but it should >> work, I think. I also didn't make the change in the 1.3 tree. >> >> Adam >> >> [1] http://marc.info/?t=123630641100001&r=1&w=2 >> >> >> ------------------------------------------------------------------------ >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscribe@... >> For additional commands, e-mail: dev-help@... > > > ------------------------------------------------------------------------ > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@... > For additional commands, e-mail: dev-help@... Index: Core.pm =================================================================== --- Core.pm (revision 750777) +++ Core.pm (working copy) @@ -131,7 +131,8 @@ } BEGIN { - if ($Config{'osname'} eq 'solaris' && $Config{'osvers'} >= 2.6 ) { + my ($major,$minor) = split('\.',$Config{'osvers'}); + if ($Config{'osname'} eq 'solaris' && ($major > 2 || $major == 2 && $minor >= 6)) { *_platform_check_size = \&_solaris_2_6_size_check; *_platform_getppid = \&_perl_getppid; } --- SizeLimit.pm.orig 2009-03-06 01:19:31.000000000 -0500 +++ SizeLimit.pm 2009-03-06 08:54:24.000000000 -0500 @@ -52,7 +52,8 @@ if Apache2::MPM->is_threaded(); # decide at compile time how to check for a process' memory size. - if (SOLARIS && $Config{'osvers'} >= 2.6) { + my ($major,$minor) = split('\.',$Config{'osvers'}); + if (SOLARIS && ($major > 2 || $major == 2 && $minor >= 6)) { $HOW_BIG_IS_IT = \&solaris_2_6_size_check; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10Fred suggested in resend these patches relative to the root of the
distributions, so here they are. SizeLimit.patch is against the version of Apache2::SizeLimit in mod_perl 2.0.4 and generated via git diff. svn.SizeLimit.patch is against the version of SizeLimit in svn, and was generated with svn diff. If there is anything else i can do, let me know. If there is another way i should be submitting this stuff, let me know. Adam diff --git a/lib/Apache2/SizeLimit.pm b/lib/Apache2/SizeLimit.pm index 031640e..702ff2a 100644 --- a/lib/Apache2/SizeLimit.pm +++ b/lib/Apache2/SizeLimit.pm @@ -52,7 +52,8 @@ BEGIN { if Apache2::MPM->is_threaded(); # decide at compile time how to check for a process' memory size. - if (SOLARIS && $Config{'osvers'} >= 2.6) { + my ($major,$minor) = split('.',$Config{'osvers'}); + if (SOLARIS && ($major > 2 || $major == 2 && $minor >= 6)) { $HOW_BIG_IS_IT = \&solaris_2_6_size_check; Index: lib/Apache/SizeLimit/Core.pm =================================================================== --- lib/Apache/SizeLimit/Core.pm (revision 750777) +++ lib/Apache/SizeLimit/Core.pm (working copy) @@ -131,7 +131,8 @@ } BEGIN { - if ($Config{'osname'} eq 'solaris' && $Config{'osvers'} >= 2.6 ) { + my ($major,$minor) = split('.',$Config{'osvers'}); + if ($Config{'osname'} eq 'solaris' && ($major > 2 || $major == 2 && $minor >= 6)) { *_platform_check_size = \&_solaris_2_6_size_check; *_platform_getppid = \&_perl_getppid; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10On Wed, Mar 18, 2009 at 7:14 PM, Adam Prime <adam.prime@...> wrote:
> Fred suggested in resend these patches relative to the root of the > distributions, so here they are. SizeLimit.patch is against the version > of Apache2::SizeLimit in mod_perl 2.0.4 and generated via git diff. > svn.SizeLimit.patch is against the version of SizeLimit in svn, and was > generated with svn diff. This git diff doesn't match what I have in svn trunk for Apache2/SizeLimit.pm, there is no SOLARIS constant anywhere that I can find, I think that you may be a few versions behind. Here's svn diff applied to your second part of the patch. I'd like to see the $major/$minor logic use a couple of more parentheses to spell out exactly what it is doing without having to worry about whether the conditional parser in my head is interpreting this conditional correctly. Index: lib/Apache/SizeLimit/Core.pm =================================================================== --- lib/Apache/SizeLimit/Core.pm (revision 755867) +++ lib/Apache/SizeLimit/Core.pm (working copy) @@ -131,7 +131,11 @@ } BEGIN { - if ($Config{'osname'} eq 'solaris' && $Config{'osvers'} >= 2.6 ) { + my ($major,$minor) = split('.',$Config{'osvers'}); + + if ($Config{'osname'} eq 'solaris' && + ($major > 2 || $major == 2 && $minor >= 6)) { + *_platform_check_size = \&_solaris_2_6_size_check; *_platform_getppid = \&_perl_getppid; > > If there is anything else i can do, let me know. If there is another > way i should be submitting this stuff, let me know. > > Adam > > diff --git a/lib/Apache2/SizeLimit.pm b/lib/Apache2/SizeLimit.pm > index 031640e..702ff2a 100644 > --- a/lib/Apache2/SizeLimit.pm > +++ b/lib/Apache2/SizeLimit.pm > @@ -52,7 +52,8 @@ BEGIN { > if Apache2::MPM->is_threaded(); > > # decide at compile time how to check for a process' memory size. > - if (SOLARIS && $Config{'osvers'} >= 2.6) { > + my ($major,$minor) = split('.',$Config{'osvers'}); > + if (SOLARIS && ($major > 2 || $major == 2 && $minor >= 6)) { > > $HOW_BIG_IS_IT = \&solaris_2_6_size_check; > > > Index: lib/Apache/SizeLimit/Core.pm > =================================================================== > --- lib/Apache/SizeLimit/Core.pm (revision 750777) > +++ lib/Apache/SizeLimit/Core.pm (working copy) > @@ -131,7 +131,8 @@ > } > > BEGIN { > - if ($Config{'osname'} eq 'solaris' && $Config{'osvers'} >= 2.6 ) { > + my ($major,$minor) = split('.',$Config{'osvers'}); > + if ($Config{'osname'} eq 'solaris' && ($major > 2 || $major == 2 && $minor >= 6)) { > *_platform_check_size = \&_solaris_2_6_size_check; > *_platform_getppid = \&_perl_getppid; > } > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@... > For additional commands, e-mail: dev-help@... > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10Fred Moyer wrote:
> On Wed, Mar 18, 2009 at 7:14 PM, Adam Prime <adam.prime@...> wrote: >> Fred suggested in resend these patches relative to the root of the >> distributions, so here they are. SizeLimit.patch is against the version >> of Apache2::SizeLimit in mod_perl 2.0.4 and generated via git diff. >> svn.SizeLimit.patch is against the version of SizeLimit in svn, and was >> generated with svn diff. > > This git diff doesn't match what I have in svn trunk for > Apache2/SizeLimit.pm, Thats because it's against the version in mod_perl 2.0.4, which is nothing like the version that currently in svn. > applied to your second part of the patch. I'd like to see the > $major/$minor logic use a couple of more parentheses to spell out > exactly what it is doing without having to worry about whether the > conditional parser in my head is interpreting this conditional > correctly. Do you want me to resubmit it like : (($major > 2) || ($major == 2 && $minor >= 6)) I'm guessing that's what you mean. Adam > Index: lib/Apache/SizeLimit/Core.pm > =================================================================== > --- lib/Apache/SizeLimit/Core.pm (revision 755867) > +++ lib/Apache/SizeLimit/Core.pm (working copy) > @@ -131,7 +131,11 @@ > } > > BEGIN { > - if ($Config{'osname'} eq 'solaris' && $Config{'osvers'} >= 2.6 ) { > + my ($major,$minor) = split('.',$Config{'osvers'}); > + > + if ($Config{'osname'} eq 'solaris' && > + ($major > 2 || $major == 2 && $minor >= 6)) { > + > *_platform_check_size = \&_solaris_2_6_size_check; > *_platform_getppid = \&_perl_getppid; > > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10What is status of this issue? I don't see any related change in svn.
Thanks, Petr
|
|
|
Re: Apache::SizeLimit + solaris Update 10Petr Sumbera wrote:
> What is status of this issue? I don't see any related change in svn. > > Thanks, > > Petr No one every replied to that last question, and nothing has happened since then by the looks of things. Adam --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10 (new patch)Hi,
can someone please reevaluate and commit attached patch? I would love to see it in mod_perl 2.0.5 and 1.32 when they are released.. Thanks, Petr solaris.diff |
|
|
Re: Apache::SizeLimit + solaris Update 10 (new patch)Petr Sumbera wrote:
> Hi, > > can someone please reevaluate and commit attached patch? I would love to see > it in mod_perl 2.0.5 and 1.32 when they are released.. > > Thanks, > > Petr > > http://old.nabble.com/file/p26284847/solaris.diff solaris.diff If no one objects in the next few day or so i'll commit this (finally) Adam --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10 (new patch)On Wed, Nov 11, 2009 at 7:56 PM, Adam Prime <adam.prime@...> wrote:
> Petr Sumbera wrote: >> >> Hi, >> >> can someone please reevaluate and commit attached patch? I would love to >> see >> it in mod_perl 2.0.5 and 1.32 when they are released.. >> >> Thanks, >> >> Petr >> >> http://old.nabble.com/file/p26284847/solaris.diff solaris.diff > > If no one objects in the next few day or so i'll commit this (finally) Can you post the patch inline to this email so everyone can review it? --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10 (new patch)Fred Moyer wrote:
> On Wed, Nov 11, 2009 at 7:56 PM, Adam Prime <adam.prime@...> wrote: >> Petr Sumbera wrote: >>> Hi, >>> >>> can someone please reevaluate and commit attached patch? I would love to >>> see >>> it in mod_perl 2.0.5 and 1.32 when they are released.. >>> >>> Thanks, >>> >>> Petr >>> >>> http://old.nabble.com/file/p26284847/solaris.diff solaris.diff >> If no one objects in the next few day or so i'll commit this (finally) > > Can you post the patch inline to this email so everyone can review it? Thanks, Petr Index: lib/Apache/SizeLimit/Core.pm =================================================================== --- lib/Apache/SizeLimit/Core.pm (revision 834457) +++ lib/Apache/SizeLimit/Core.pm (working copy) @@ -131,7 +131,10 @@ } BEGIN { - if ($Config{'osname'} eq 'solaris' && $Config{'osvers'} >= 2.6 ) { + my ($major, $minor) = split(/\./, $Config{'osvers'}); + + if ($Config{'osname'} eq 'solaris' && + ($major > 2 || ($major == 2 && $minor >= 6))) { *_platform_check_size = \&_solaris_2_6_size_check; *_platform_getppid = \&_perl_getppid; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10 (new patch)Any comments?
Petr Sumbera wrote: > Fred Moyer wrote: >> On Wed, Nov 11, 2009 at 7:56 PM, Adam Prime <adam.prime@...> >> wrote: >>> Petr Sumbera wrote: >>>> Hi, >>>> >>>> can someone please reevaluate and commit attached patch? I would >>>> love to >>>> see >>>> it in mod_perl 2.0.5 and 1.32 when they are released.. >>>> >>>> Thanks, >>>> >>>> Petr >>>> >>>> http://old.nabble.com/file/p26284847/solaris.diff solaris.diff >>> If no one objects in the next few day or so i'll commit this (finally) >> >> Can you post the patch inline to this email so everyone can review it? > > Resending (this time directly). > > Thanks, > > Petr > > > ------------------------------------------------------------------------ > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@... > For additional commands, e-mail: dev-help@... --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10 (new patch)On Mon, Nov 16, 2009 at 8:07 AM, Adam Prime <adam.prime@...> wrote:
> Any comments? Looks pretty safe. +1 > > Petr Sumbera wrote: >> >> Fred Moyer wrote: >>> >>> On Wed, Nov 11, 2009 at 7:56 PM, Adam Prime <adam.prime@...> >>> wrote: >>>> >>>> Petr Sumbera wrote: >>>>> >>>>> Hi, >>>>> >>>>> can someone please reevaluate and commit attached patch? I would love >>>>> to >>>>> see >>>>> it in mod_perl 2.0.5 and 1.32 when they are released.. >>>>> >>>>> Thanks, >>>>> >>>>> Petr >>>>> >>>>> http://old.nabble.com/file/p26284847/solaris.diff solaris.diff >>>> >>>> If no one objects in the next few day or so i'll commit this (finally) >>> >>> Can you post the patch inline to this email so everyone can review it? >> >> Resending (this time directly). >> >> Thanks, >> >> Petr >> >> >> ------------------------------------------------------------------------ >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscribe@... >> For additional commands, e-mail: dev-help@... > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@... > For additional commands, e-mail: dev-help@... > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10 (new patch)On Mon, Nov 16, 2009 at 8:25 AM, Fred Moyer <fred@...> wrote:
> On Mon, Nov 16, 2009 at 8:07 AM, Adam Prime <adam.prime@...> wrote: >> Any comments? > > Looks pretty safe. +1 That being said, I think this line: + ($major > 2 || ($major == 2 && $minor >= 6))) { is better written as (($major > 2) or (($major == 2) && ($minor >= 6))) { I can't remember the style guide off the top of my head, I have it plugged into my mod_perl perltidy instance. > >> >> Petr Sumbera wrote: >>> >>> Fred Moyer wrote: >>>> >>>> On Wed, Nov 11, 2009 at 7:56 PM, Adam Prime <adam.prime@...> >>>> wrote: >>>>> >>>>> Petr Sumbera wrote: >>>>>> >>>>>> Hi, >>>>>> >>>>>> can someone please reevaluate and commit attached patch? I would love >>>>>> to >>>>>> see >>>>>> it in mod_perl 2.0.5 and 1.32 when they are released.. >>>>>> >>>>>> Thanks, >>>>>> >>>>>> Petr >>>>>> >>>>>> http://old.nabble.com/file/p26284847/solaris.diff solaris.diff >>>>> >>>>> If no one objects in the next few day or so i'll commit this (finally) >>>> >>>> Can you post the patch inline to this email so everyone can review it? >>> >>> Resending (this time directly). >>> >>> Thanks, >>> >>> Petr >>> >>> >>> ------------------------------------------------------------------------ >>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: dev-unsubscribe@... >>> For additional commands, e-mail: dev-help@... >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscribe@... >> For additional commands, e-mail: dev-help@... >> >> > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
|
|
Re: Apache::SizeLimit + solaris Update 10 (new patch)Fred Moyer wrote:
> On Mon, Nov 16, 2009 at 8:25 AM, Fred Moyer <fred@...> wrote: >> On Mon, Nov 16, 2009 at 8:07 AM, Adam Prime <adam.prime@...> wrote: >>> Any comments? >> Looks pretty safe. +1 > > That being said, I think this line: > > + ($major > 2 || ($major == 2 && $minor >= 6))) { > > is better written as > > (($major > 2) or (($major == 2) && ($minor >= 6))) { > > I can't remember the style guide off the top of my head, I have it > plugged into my mod_perl perltidy instance. > Sure. Adam --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@... For additional commands, e-mail: dev-help@... |
| Free embeddable forum powered by Nabble | Forum Help |