RE: [ros-svn] [chorns] 19566: Speed up compilation of ntoskrnl

[Ge van Geldorp]

> From: [e-mail]
>
> Speed up compilation of ntoskrnl

Hmm, an unexpected consequence is that we can no longer enable DPRINTs per
file by removing the "#define NDEBUG" statement. At the moment, the first
source files included by io.c and cc.c (resp io/adapter.c and cc/cacheman.c)
don't define NDEBUG before including debug.h. As a result, all DPRINTs in
every file included by io.c/cc.c are enabled.

GvG

[Hartmut Birr]

Ge van Geldorp wrote:
> > From: [e-mail]
> >
> > Speed up compilation of ntoskrnl
>
> Hmm, an unexpected consequence is that we can no longer enable DPRINTs per
> file by removing the "#define NDEBUG" statement. At the moment, the first
> source files included by io.c and cc.c (resp io/adapter.c and cc/cacheman.c)
> don't define NDEBUG before including debug.h. As a result, all DPRINTs in
> every file included by io.c/cc.c are enabled.
>
> GvG

I see the same problem. I've fixed it, by modifying debug.h. Now you
have to add an explicit statement #undef NDEBUG.

- Hartmut

Index: ntoskrnl/include/internal/debug.h
===================================================================
--- ntoskrnl/include/internal/debug.h	(Revision 19569)
+++ ntoskrnl/include/internal/debug.h	(Arbeitskopie)
@@ -15,6 +15,30 @@
  *        Define NASSERT before including this header to disable assertions
  */

+#ifdef CHECKPOINT
+#undef CHECKPOINT
+#endif
+
+#ifdef DPRINT
+#undef DPRINT
+#endif
+
+#ifndef NDEBUG
+#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */
+#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0)
+#else
+#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint
+#endif
+#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0)
+#else /* NDEBUG */
+#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */
+#define DPRINT(args...)
+#else
+#define DPRINT
+#endif
+#define CHECKPOINT
+#endif /* NDEBUG */
+
 #ifndef __INTERNAL_DEBUG
 #define __INTERNAL_DEBUG

@@ -91,26 +115,8 @@
 #endif /* !__USE_W32API */

#endif /* DBG */
-
 #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0)

-#ifndef NDEBUG
-#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */
-#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0)
-#else
-#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint
-#endif
-#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0)
-#else /* NDEBUG */
-#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */
-#define DPRINT(args...)
-#else
-#define DPRINT
-#endif
-#define CHECKPOINT
-#endif /* NDEBUG */
-
-
 /*
  * FUNCTION: Assert a maximum value for the current irql
  * ARGUMENTS:

[Ge van Geldorp]

> From: Hartmut Birr
>
> I see the same problem. I've fixed it, by modifying debug.h. 
> Now you have to add an explicit statement #undef NDEBUG.

Any reason not to let the rest of us benefit from this (or, in other words,
can you please commit that change)?

Thanks, GvG

[Casper Hornstrup]

> -----Original Message-----
> From: [e-mail] [mailto:[e-mail]] On Behalf Of Ge van Geldorp
> Sent: 25. november 2005 22:50
> To: [e-mail]
> Subject: [ros-dev] RE: [ros-svn] [chorns] 19566: Speed up compilation ofntoskrnl
> > From: [e-mail]
> >
> > Speed up compilation of ntoskrnl
>
> Hmm, an unexpected consequence is that we can no longer enable DPRINTs per
> file by removing the "#define NDEBUG" statement. At the moment, the first
> source files included by io.c and cc.c (resp io/adapter.c and cc/cacheman.c)
> don't define NDEBUG before including debug.h. As a result, all DPRINTs in
> every file included by io.c/cc.c are enabled.
>
> GvG

Yes, I have thought of this. You need to disable the multiple source
file per compilation unit feature if you want to do this. This is explained
in Makefile. You do this by setting ROS_RBUILDFLAGS=-ud. Of course this is
only a problem until someone implements the new debugging system that was
talked about, although that could take a while since no one is actually
working on it ;-(

Casper