From 6b7990dcc747be10ab268d3720992901cf637000 Mon Sep 17 00:00:00 2001
From: "pierre%netscape.com"
 <pierre%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 21 Oct 1999 05:41:45 +0000
Subject: [PATCH] Enabled MOZ_PERF_METRICS in the Mac build: - updated
 DefinesMozilla.h - fixed stopwatch.cpp - created libutilIDL.mcp - added
 StopWatch exports to libutil.exp - added xpcom.shlb to libutil.mcp - added
 libutil.shlb to htmlparser.mcp, layout.mcp, webshell.mcp

git-svn-id: svn://10.0.0.236/trunk@51365 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/build/mac/NGLayoutBuildList.pm        |   1 +
 mozilla/config/mac/DefinesMozilla.h           |   3 +++
 mozilla/htmlparser/macbuild/htmlparser.mcp    | Bin 80983 -> 80983 bytes
 mozilla/layout/macbuild/layout.mcp            | Bin 130139 -> 131001 bytes
 mozilla/modules/libutil/macbuild/libutil.exp  |  12 ++++++++++++
 mozilla/modules/libutil/macbuild/libutil.mcp  | Bin 115746 -> 116066 bytes
 mozilla/modules/libutil/src/stopwatch.cpp     |   6 ++++--
 .../parser/htmlparser/macbuild/htmlparser.mcp | Bin 80983 -> 80983 bytes
 mozilla/webshell/macbuild/webshell.mcp        | Bin 117353 -> 117353 bytes
 9 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/mozilla/build/mac/NGLayoutBuildList.pm b/mozilla/build/mac/NGLayoutBuildList.pm
index 1210117bcf5..dea3355d79d 100644
--- a/mozilla/build/mac/NGLayoutBuildList.pm
+++ b/mozilla/build/mac/NGLayoutBuildList.pm
@@ -839,6 +839,7 @@ sub BuildIDLProjects()
 	}
 
 	BuildIDLProject(":mozilla:modules:libpref:macbuild:libprefIDL.mcp",				"libpref");
+	BuildIDLProject(":mozilla:modules:libutil:macbuild:libutilIDL.mcp",				"libutil");
 	BuildIDLProject(":mozilla:modules:libjar:macbuild:libjarIDL.mcp",				"libjar");
 	BuildIDLProject(":mozilla:modules:oji:macbuild:ojiIDL.mcp",						"oji");
 	BuildIDLProject(":mozilla:js:macbuild:XPConnectIDL.mcp", 						"xpconnect");
diff --git a/mozilla/config/mac/DefinesMozilla.h b/mozilla/config/mac/DefinesMozilla.h
index 5685a3f44ba..db97de27bb8 100644
--- a/mozilla/config/mac/DefinesMozilla.h
+++ b/mozilla/config/mac/DefinesMozilla.h
@@ -90,4 +90,7 @@
 
 #define DETECT_WEBSHELL_LEAKS 1
 
+//#define MOZ_PERF_METRICS 1		// Uncomment to get metrics in layout, parser and webshell.
+															// You also need to define __TIMESIZE_DOUBLE__ in <timesize.mac.h>
+
 #endif /* DefinesMozilla_h_ */
diff --git a/mozilla/htmlparser/macbuild/htmlparser.mcp b/mozilla/htmlparser/macbuild/htmlparser.mcp
index 31d00d511ab60a060fd4a639985a2b0b6dbb3088..c296f178d8a7f6cf6f34cc65e02aa95b8d603332 100644
GIT binary patch
delta 471
zcmccqgXQ`UmJQmBrsfO`j1CM8{Iv`W0t`U5IYWw(NxXY%UTRTha(r%nUTS4QDNsTk
zh^<+G1PcSB+~fqtL%d)SHlPR_1Eb_*eWs}s1K1`%@MW3&d~(EOE#|I?0W6!hFvlyf
z8(%U1|No!NW+|12Ozg%Nr~d!n{AshH$}h&re>B8_0t*-z936oIKN%<Ms~K%})z)NU
zV>AQ0#dLFy?p-F3nVUlmav25L-8_9<fwqZ4Y01f_4Q(N!KvzkDM8U2TG>V*j#ZheY
z1fyLBk~x`4r6rj;E~!bS>3YQ(IY|sqk;x8UCIHRm*!(*=pHGNC4rn3JQV`%T00qQE
z$AZlw#h+PO<v=o<c`6;5CkAM2cHOi=Wb@w%EEb!EPXZ++K}vy=4$PCiFU?>9g~jHp
zm*Qh4PcWLn0&)$|V>XPNANaa3P7FA>UC@|OfJv(84FdzGMQ%w!4$wAGph5xD;px_<
zjJoWM`X)e;IotD18MT=i8K=*-VAPkD2MP%Q^<)BRP_RS6B}*V<&i3aPj0Ma9)W(5g

delta 420
zcmccqgXQ`UmJQmBrlt%Gj1CM8{BaBn0t`U5DMMneowHjRQ**t3E0ar6VtGJ*4p2f3
zh^<+G1PcSB?BoQ-Lz5pkvT%Y$*?^*x^_iwlzTn6;`SIkK$!g49o3}8>E3nJ5pI~6f
zYuYTO@{oyL`k5#LL!|U(LzQ2QlmBRl0|j^)8030@0zVli>#G@UcGcEo+FYi4n`vSI
z$K(gTESp0Oav3?<+&q0;*%%l_Cto(Sh46rGkeaM$6seY%$;!H-fR*(y&<P9-%-Spt
z90q3(_yv2qcm}yThxi9Yg5)<(Fxq7>(P<^nOpeXJlk@o|x;Iar!=%3XP0?r8$=fSb
zH{YA3$h_Hg(*}{ve<!e5Obig(%y<$gb><vMN`ZN@<)s;$A72WL+3cWlgK_f%Ul+!S
z0SC7W8Z!zoNfnDQFmPJrmK1=32^2z5z;t}NwJD=6JA=^#pva8v`KFB8%#6a*XIn7p
d%PIqf1b})nfix)mpx}}>kTGNXa|^}-W&j&Jc_jb<

diff --git a/mozilla/layout/macbuild/layout.mcp b/mozilla/layout/macbuild/layout.mcp
index 95593327d199cd9bed3c74d742933a7b6b3336a0..106eb0ecdd5fcfbcde58f6e484130982255adfb3 100644
GIT binary patch
delta 424
zcmccpgMH_Jc9G=#{2T@b24)5ZMhynW&p#O$zbbAN5oc6=2^M59n90Ck0#v~Ck|8~{
z$SuIoD6iNvpeVICI3qPDXL10exhyYGuLuiJ4GRO)As`#X7i9(VSs9oPY+l016)R*=
z1vKFWPzVSNdO)UaHcXOcoP0Z;kKOpw=KufKE!g}a-jIpi`1WH4hFYV|hP!?-PF6}0
z2MXN&|9`1FP~bP?X6v*p7FM7!OwTtj%38>|*}LQnuOye7r;jVpY7Z#w0HqI2)@bsD
z$O0YW4iW{@_E7r3<hG`poD6<nn9L7^FfnYdXlDA!3Uocw%kA|wjGqLyd-pL`8OY{j
zCY6?C=D4ILm8R<zXXGR?Kt({D$q(P!Y=5wiQI~nU_aVl|nyd#vz69yFW}FzHx_$Cn
zMgtZWa42lt3S@!8XZqofj9yH=h1>Z*F|K7~XZ-LM7;Yxp4}WGn#K?58aC-Y!MmM%M
NJHdjNzcO~P0RT3hhtB{2

delta 348
zcmdn_pZ)d^c9G=#{2T@b24)5ZMhynW53?B<KOWvFBF?D#94yFSP{qJt0#v~CoWVS=
z*we8jKi4hDBCj~Oq$o2leR2S!xhxM*uLuiJ4GRO)K_DB%7i9(VSs9r2Z(hR46}#Cy
zNtbc*?RY+RS&o+f|NBxme~33^Vwe7s_W%E{Q=2EQ{lz$0DMcJ85X-<&GZQHAn{l&s
zS{BRZwOR8xCkAkA_AWWYE6C~Q>EjBt!~;q@Og3opW#pV(*Cal9Zqp^nuz;Z8)YNP@
zKlUbXzA(SwcprcF_#jsw*Uc5pOh2aw)iA1VzOX@>ar>@X#_jwQ18!|E>}9Mn*gR>i
z4D-Z*tnGyd86Rs-*Le+AX3aP;fOY%MH;e`>(-prmdNK8RZ_oY8xR#NfVe3YqUk$b^
cerG(y$aKhi`qLkbZftKSg9QzLGIp>50GO+FZvX%Q

diff --git a/mozilla/modules/libutil/macbuild/libutil.exp b/mozilla/modules/libutil/macbuild/libutil.exp
index bbc48fb3fa3..4bedbe7f456 100644
--- a/mozilla/modules/libutil/macbuild/libutil.exp
+++ b/mozilla/modules/libutil/macbuild/libutil.exp
@@ -8,3 +8,15 @@ XP_NotifyObservers
 XP_DisableObserverNotification
 XP_EnableObserverNotification
 XP_IsObserverNotificationEnabled
+Print__9StopwatchFv
+GetCPUTime__9StopwatchFv
+GetRealTime__9StopwatchFv
+CpuTime__9StopwatchFv
+RealTime__9StopwatchFv
+Continue__9StopwatchFv
+RestoreState__9StopwatchFv
+SaveState__9StopwatchFv
+Stop__9StopwatchFv
+Start__9StopwatchFi
+__dt__9StopwatchFv
+__ct__9StopwatchFv
diff --git a/mozilla/modules/libutil/macbuild/libutil.mcp b/mozilla/modules/libutil/macbuild/libutil.mcp
index 2b9f5cffa26e0213e426990d87e9eb391f33b6ac..fc0291a98783686552a38dfbc6745f5a81f88a23 100644
GIT binary patch
delta 437
zcmZ3~!TzX=T_ia_KZk*Vfti7UQG<bTn-c@$_N<K}j7+?oKv6z+AOXaaH!Crn=N9CE
zC}dy-(rh4^$xM9a(+`+3vT*W&<bZhUW;edMM(oCyGZ+{u8aHp8_KR`y6DM(?z&r+q
zv~r-pPsYi=T`XBZrcPeqDl*x}Rhf}va*nI?<Zf487LXCs-)&{I-Tc$lnS<T<Yt8@v
zpQ|=I`)y`YWO4KKaRutDgVOa-x&ca0p3EO;$$t0lT?QcD93JS*$T)fO!7i1}`-5(p
zvrYv%@bBdKK!xVLUEB9|G3IGcjtD4#7z(tt3uFk8?uODmP<ra*hXJC*S#4i&VFS<-
z5O83!m^?v4BPTyET_GjEG%1I%V#x*TT3*h~yqwIuRESurLSji`o(5PxRiQ$2yVf?w
jg-q;>+q8g@;jsPE4#w-uj4In#?O`kj(#w?&FtPvuGtYjf

delta 286
zcmaFV#lEP6T_ia_KZk*Vfti7UQG<bTD-#3bHm!{!j7+>7Kv6z+AOXaaHY+im=N1Gi
zVqgVgHi#$#+his_bBIEaY9OAn*^O_m5xbG*`v3p88*bh>?HA+ZCr;uZ0if2oK!Kl(
zlYhHdPM+f`G1<ped3x+tMgd0l>3LfjB__{sRha&2E2GoqU#?CZ>_$4O|Nmd)*zD}L
znMsn_&C|yf=#V-nT@R%jCW{AJ^6zC}$WcJR&EbL0jFW!_YHU6fbj_S~0?=vhlj8#w
wn)h~X-`mBQr@cLUJL3W-c7}j(psyLW3+-aO&djK={ncK^av;4t=^!Hu03*>*VgLXD

diff --git a/mozilla/modules/libutil/src/stopwatch.cpp b/mozilla/modules/libutil/src/stopwatch.cpp
index 2d39775fdc1..2964ee8eb46 100644
--- a/mozilla/modules/libutil/src/stopwatch.cpp
+++ b/mozilla/modules/libutil/src/stopwatch.cpp
@@ -130,7 +130,8 @@ double Stopwatch::CpuTime() {
 
 double Stopwatch::GetRealTime(){ 
 #if defined(R__MAC)
-   return(double)clock() / gTicks;
+// return(double)clock() / gTicks;
+   return(double)clock() / 1000000L;
 #elif defined(R__UNIX)
    struct tms cpt;
    return (double)times(&cpt) / gTicks;
@@ -150,7 +151,8 @@ double Stopwatch::GetRealTime(){
 
 double Stopwatch::GetCPUTime(){ 
 #if defined(R__MAC)
-   return(double)clock() / gTicks;
+// return(double)clock() / gTicks;
+   return(double)clock();
 #elif defined(R__UNIX)
    struct tms cpt;
    times(&cpt);
diff --git a/mozilla/parser/htmlparser/macbuild/htmlparser.mcp b/mozilla/parser/htmlparser/macbuild/htmlparser.mcp
index 31d00d511ab60a060fd4a639985a2b0b6dbb3088..c296f178d8a7f6cf6f34cc65e02aa95b8d603332 100644
GIT binary patch
delta 471
zcmccqgXQ`UmJQmBrsfO`j1CM8{Iv`W0t`U5IYWw(NxXY%UTRTha(r%nUTS4QDNsTk
zh^<+G1PcSB+~fqtL%d)SHlPR_1Eb_*eWs}s1K1`%@MW3&d~(EOE#|I?0W6!hFvlyf
z8(%U1|No!NW+|12Ozg%Nr~d!n{AshH$}h&re>B8_0t*-z936oIKN%<Ms~K%})z)NU
zV>AQ0#dLFy?p-F3nVUlmav25L-8_9<fwqZ4Y01f_4Q(N!KvzkDM8U2TG>V*j#ZheY
z1fyLBk~x`4r6rj;E~!bS>3YQ(IY|sqk;x8UCIHRm*!(*=pHGNC4rn3JQV`%T00qQE
z$AZlw#h+PO<v=o<c`6;5CkAM2cHOi=Wb@w%EEb!EPXZ++K}vy=4$PCiFU?>9g~jHp
zm*Qh4PcWLn0&)$|V>XPNANaa3P7FA>UC@|OfJv(84FdzGMQ%w!4$wAGph5xD;px_<
zjJoWM`X)e;IotD18MT=i8K=*-VAPkD2MP%Q^<)BRP_RS6B}*V<&i3aPj0Ma9)W(5g

delta 420
zcmccqgXQ`UmJQmBrlt%Gj1CM8{BaBn0t`U5DMMneowHjRQ**t3E0ar6VtGJ*4p2f3
zh^<+G1PcSB?BoQ-Lz5pkvT%Y$*?^*x^_iwlzTn6;`SIkK$!g49o3}8>E3nJ5pI~6f
zYuYTO@{oyL`k5#LL!|U(LzQ2QlmBRl0|j^)8030@0zVli>#G@UcGcEo+FYi4n`vSI
z$K(gTESp0Oav3?<+&q0;*%%l_Cto(Sh46rGkeaM$6seY%$;!H-fR*(y&<P9-%-Spt
z90q3(_yv2qcm}yThxi9Yg5)<(Fxq7>(P<^nOpeXJlk@o|x;Iar!=%3XP0?r8$=fSb
zH{YA3$h_Hg(*}{ve<!e5Obig(%y<$gb><vMN`ZN@<)s;$A72WL+3cWlgK_f%Ul+!S
z0SC7W8Z!zoNfnDQFmPJrmK1=32^2z5z;t}NwJD=6JA=^#pva8v`KFB8%#6a*XIn7p
d%PIqf1b})nfix)mpx}}>kTGNXa|^}-W&j&Jc_jb<

diff --git a/mozilla/webshell/macbuild/webshell.mcp b/mozilla/webshell/macbuild/webshell.mcp
index 9ecb58cac8c14c7669c54effb331f3636d8f24a5..7b9a9794e31ce0ebac21766c6fd059f65f5aa186 100644
GIT binary patch
delta 486
zcmaDkh5h9e_6^ZYtcw{K7#3}gVEW9cy9CHQz`($j&%nR~WHKyaD0a@zD@m;=VVdkH
z+i09u98#1B6lY>!WRRKYD7|?$iz1^CKTt%014sa|Gl&qMtdJ|d`6=r`MiH<aCr}QE
zT|xSQV7lNcMzzTw1h^(YF{zxaCTY#+Jb6AxBXdz&;$~$|E-i_i%%swi%p8~0q|$V~
z;*6Xm28hUHfnUES1}vTYfSqOY3lnuNA+7+R$sqRw0ap@`ShD$`YbfKUYeI~hFSr^p
zZr<heg^S(zuFC)an_o`fxSdgW^9kRyKA;E_14E(9=D>Sj87Bs?O*XhE#%_G)_y7ML
zY)~<l?K3nPPfJcd<|ID(g6pI0F)oaKdLXe=nUj?{EtrAcnJ&1T(R6a0Dew0ClNr6F
zL9Uwof<1weYqBSYI?zj*9JWCAat?V$*U9@ilBWx=Vl>?Tb0ecM6RR`GsoM>=FrHwV
z7$CHL*H*?NW>#0A;NtCuI~jK}voo&OU|?Wu*#2=3qZ6Cdh7}A9tPHs&1vx+^!0?3u
l_Q%tG4>RhqaU=spY_>NZX5?gIXPgWQ2%GH_k22n10RSUmk@)}s

delta 412
zcmXAl-z$S*6vxkbZJxag&5tZURzzkOBr_C>*$uV4NxAT|h!m0^H_C-S!0PRhN4c^h
zx!LR~PZLEVaW{n<EOOz7k(=dWo_9{2Z|D2@o^x~F*U9@j2@fcIOi7@wS!#j+a0+16
z0J7u=LFnytH_a||_V~5M`PO>R>_V4Mas?1d^^Ow0Wh%$K97)P7Qe=A#vD2~{JAX5u
zVL>`mWhUEa+{t3O`&dQe#Kc@797mM}Lg-{CA#9|(mSr|Vv4sz)F&F=i2{iWT2U+4n
zo`}l(-IEx(%R@fuu19|4{jm~9PC+X5xy=p)=JPB6M1Yh!E&$pJ`B&^0Y28zy1ShG~
z{h9<x6q_!*DWaENJGEI~#GnrYwFbMM(zQ7{?8z3-6uV1wZG|Rmm66*xvdLwvHpD6R
z!su2Qk6^XP;JBlR<e>pfQ3?8@xRF7CyaHgm_&P>!X7NE1zzj2sbJPFdk(#cCN9I4r
Y+RUOVX`99BIjRZ)wIc2G3w$vB0e%62`Tzg`