I don't want make to consume both CPU's.
Ged.
-----Original Message-----
From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dreimer(a)svn.reactos.org
Sent: 20 August 2008 10:10
To: ros-diffs(a)reactos.org
Subject: [ros-diffs] [dreimer] 35473: make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible.
Author: dreimer
Date: Wed Aug 20 04:10:07 2008
New Revision: 35473
URL: http://svn.reactos.org/svn/reactos?rev=35473&view=rev
Log:
make automatically behaves like makex when there is more then one CPU Core now. makex kept for now to keep compatible.
Modified:
trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Aug 20 04:10:07 2008
@@ -103,11 +103,20 @@
)
::
+:: Get the number of CPUs in the system so we know how many jobs to execute.
+:: To modify the number used alter the options used with cpucount:
+:: No Option - Number of CPUs.
+:: -x1 - Number of CPUs, plus 1.
+:: -x2 - Number of CPUs, doubled.
+:: -a - Determine the cpu count based on the inherited process affinity mask.
+::
+for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i
+::
:: Check if we are using -j or not.
::
-if "%1" == "multi" (
- if not "%2" == "" (
- title 'makex %2' parallel build started: %TIMERAW%
+if %CPUCOUNT% GTR 2 (
+ if not "%1" == "" (
+ title 'makex %1' parallel build started: %TIMERAW%
) else (
title 'makex' parallel build started: %TIMERAW%
)
@@ -139,27 +148,17 @@
goto :EOF
:BUILDMULTI
- ::
- :: Get the number of CPUs in the system so we know how many jobs to execute.
- :: To modify the number used alter the options used with cpucount:
- :: No Option - Number of CPUs.
- :: -x1 - Number of CPUs, plus 1.
- :: -x2 - Number of CPUs, doubled.
- :: -a - Determine the cpu count based on the inherited process affinity mask.
- ::
- for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i
-
if %_ROSBE_SHOWTIME% == 1 (
if %_ROSBE_WRITELOG% == 1 (
- "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt"
+ "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt"
) else (
- "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9
+ "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %*
)
) else (
if %_ROSBE_WRITELOG% == 1 (
- "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt"
+ "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt"
) else (
- "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9
+ "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %*
)
)
goto :EOF
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] Wed Aug 20 04:10:07 2008
@@ -7,7 +7,7 @@
ENV = set
HELP = "%_ROSBE_BASEDIR%\Help.cmd" $*
MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $*
-MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $*
+MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" $*
RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $*
RENV = for /f "usebackq tokens=*" %i in (`set _ROSBE_`) do @echo %i
SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $*
Just a random thought wondering if anyone else has thought about it. They
are making great strides into how the GPU can now be used as a processor.
--
Two men walk into a bar....... Third one ducks....
Think about it, it will come to you. :P
On Thu, Aug 14, 2008 at 5:35 PM, <tkreuzer(a)svn.reactos.org> wrote:
> URL: http://svn.reactos.org/svn/reactos?rev=35346&view=rev
> Log:
> PE symbol dumper. It's not finished, functions don't work and the type output doesn't always look 100% correct. But it does it's job. You need dbghelp.dll and symsrv.dll from windbg.
You could also import winedump.
--
Steven Edwards
"There is one thing stronger than all the armies in the world, and
that is an idea whose time has come." - Victor Hugo
Please merge this change to trunk too, if NDK author does not object.
WBR,
Aleksey Bragin.
On Aug 16, 2008, at 3:40 AM, tkreuzer(a)svn.reactos.org wrote:
> Author: tkreuzer
> Date: Fri Aug 15 18:40:42 2008
> New Revision: 35359
>
> URL: http://svn.reactos.org/svn/reactos?rev=35359&view=rev
> Log:
> The TEB member is called ClientID not Cid on all Windows versions I
> could check (XP, 2k3, vista).
I'd rather pester you to finish work on your SEH paper and translation of
parts of your thesis.
On Fri, Aug 15, 2008 at 12:31 AM, KJK::Hyperion <hackbunny(a)reactos.org>wrote:
> Zachary Gorden ha scritto:
> > However, there may be developers who do not wish to maintain
> > their own blog or want to keep their ROS bloggings separate and want to
> > make use of the system integrated in the CMS. Any thoughts?
>
> Do both (aggregator AND blog platform). Then pester me to blog
> _______________________________________________
> Ros-web mailing list
> Ros-web(a)reactos.org
> http://www.reactos.org/mailman/listinfo/ros-web
>
Sending this to both mailing lists as I don't know how many developers are
actually subscribed to the web list.
For some time now, the blog on the ReactOS site hasn't been used. When I
asked if Aleksey was against putting up a "preview" of sorts on the front
page in an attempt to revive it, some of the developers such as Ged pointed
out no one really used it anymore and a few already had their own blogs and
didn't want to maintain two. Ged has already moved to remove the link in
the quick menu, though no formal decision has been made yet (the link is
still there until a refresh occurs, though we might end up restoring it
anyways).
I personally believe the blog could be quite useful, even if its current
form changes. An alternative would be an aggregation of the RSS feeds from
the blogs maintained by each ROS developer, assuming they have a blog.
However, there may be developers who do not wish to maintain their own blog
or want to keep their ROS bloggings separate and want to make use of the
system integrated in the CMS. Any thoughts?
else
{
/* System Thread */
Thread->StartAddress = StartRoutine;
PspSetCrossThreadFlag(Thread, CT_SYSTEM_THREAD_BIT);
Looks good to me.
And CT_SYSTEM_THREAD_BIT is defined to 0x10 which is correct:
union
{
struct
{
ULONG Terminated:1;
#if (NTDDI_VERSION >= NTDDI_LONGHORN)
ULONG ThreadInserted:1;
#else
ULONG DeadThread:1;
#endif
ULONG HideFromDebugger:1;
ULONG ActiveImpersonationInfo:1;
ULONG SystemThread:1;
so your patch was correct and should be re-applied.
On 12-Aug-08, at 3:22 PM, sginsberg(a)svn.reactos.org wrote:
> Author: sginsberg
> Date: Tue Aug 12 17:22:51 2008
> New Revision: 35294
>
> URL: http://svn.reactos.org/svn/reactos?rev=35294&view=rev
> Log:
> - Temporarily revert my last change. We don't set the SystemThread
> flag appropriately and it is always zero
>
> Modified:
> trunk/reactos/ntoskrnl/ps/kill.c
>
> Modified: trunk/reactos/ntoskrnl/ps/kill.c
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=352…
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original)
> +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Tue Aug 12
> 17:22:51 2008
> @@ -1086,7 +1086,7 @@
> PETHREAD Thread = PsGetCurrentThread();
>
> /* Make sure this is a system thread */
> - if (!Thread->SystemThread) return STATUS_INVALID_PARAMETER;
> + if (Thread->SystemThread) return STATUS_INVALID_PARAMETER;
>
> /* Terminate it for real */
> return PspTerminateThreadByPointer(Thread, ExitStatus, TRUE);
>
Best regards,
Alex Ionescu