[PATCH 5/8]: Move debugging macro to header file

[PATCH 5/8]: Move debugging macro to header file

[Gerrit Renker]

[CCID3]: Move debugging macro to header file

This moves the ccid3_pr_debug macro into the header file,
so that it can be used from other files belonging to the
CCID3 framework as well. 

Thanks to Ian McDonald for the suggestion.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
 net/dccp/ccids/ccid3.c |    8 +-------
 net/dccp/ccids/ccid3.h |    7 +++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -41,13 +41,6 @@
 #include "lib/tfrc.h"
 #include "ccid3.h"
 
-#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
-static int ccid3_debug;
-#define ccid3_pr_debug(format, a...)	DCCP_PR_DEBUG(ccid3_debug, format, ##a)
-#else
-#define ccid3_pr_debug(format, a...)
-#endif
-
 static struct dccp_tx_hist *ccid3_tx_hist;
 static struct dccp_rx_hist *ccid3_rx_hist;
 static struct dccp_li_hist *ccid3_li_hist;
@@ -1227,6 +1220,7 @@ static struct ccid_operations ccid3 = {
 };
 
 #ifdef CONFIG_IP_DCCP_CCID3_DEBUG
+int ccid3_debug;
 module_param(ccid3_debug, int, 0444);
 MODULE_PARM_DESC(ccid3_debug, "Enable debug messages");
 #endif
--- a/net/dccp/ccids/ccid3.h
+++ b/net/dccp/ccids/ccid3.h
@@ -61,6 +61,13 @@
 			rtt = CCID3_SANE_RTT_MAX;			   \
 		} 					} while (0)
 
+#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
+extern int ccid3_debug;
+#define ccid3_pr_debug(format, a...)	DCCP_PR_DEBUG(ccid3_debug, format, ##a)
+#else
+#define ccid3_pr_debug(format, a...)
+#endif
+
 enum ccid3_options {
 	TFRC_OPT_LOSS_EVENT_RATE = 192,
 	TFRC_OPT_LOSS_INTERVALS	 = 193,

Re: [PATCH 5/8]: Move debugging macro to header file

[Ian McDonald]

On 12/15/06, Gerrit Renker <gerrit@erg.abdn.ac.uk> wrote:
> [CCID3]: Move debugging macro to header file
>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
-- 
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group

Re: [PATCH 5/8]: Move debugging macro to header file

[Ian McDonald]

OK. Go to use this in net/dccp/ccids/lib/loss_interval.c and get this:
WARNING: "ccid3_debug" [net/dccp/ccids/lib/dccp_tfrc_lib.ko] undefined!

So I think I'll just do this in ccid3.c
EXPORT_SYMBOL_GPL(ccid3_debug);

and now I get this:
WARNING: Module
/lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/lib/dccp_tfrc_lib.ko
ignored, due to loop
WARNING: Loop detected:
/home/ian/tmp/lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
needs dccp_tfrc_lib.ko which needs dccp_ccid3.ko again!
WARNING: Module
/lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
ignored, due to loop

Hmm... what to do now? These need refactoring anyway but I was hoping
not to have to do that now.

Regards,

Ian

On 12/15/06, Gerrit Renker <gerrit@erg.abdn.ac.uk> wrote:
> [CCID3]: Move debugging macro to header file
>
> This moves the ccid3_pr_debug macro into the header file,
> so that it can be used from other files belonging to the
> CCID3 framework as well.
>
> Thanks to Ian McDonald for the suggestion.
>
> Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
> --- a/net/dccp/ccids/ccid3.c
> +++ b/net/dccp/ccids/ccid3.c
> @@ -41,13 +41,6 @@
>  #include "lib/tfrc.h"
>  #include "ccid3.h"
>
> -#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
> -static int ccid3_debug;
> -#define ccid3_pr_debug(format, a...)   DCCP_PR_DEBUG(ccid3_debug, format, ##a)
> -#else
> -#define ccid3_pr_debug(format, a...)
> -#endif
> -
>  static struct dccp_tx_hist *ccid3_tx_hist;
>  static struct dccp_rx_hist *ccid3_rx_hist;
>  static struct dccp_li_hist *ccid3_li_hist;
> @@ -1227,6 +1220,7 @@ static struct ccid_operations ccid3 = {
>  };
>
>  #ifdef CONFIG_IP_DCCP_CCID3_DEBUG
> +int ccid3_debug;
>  module_param(ccid3_debug, int, 0444);
>  MODULE_PARM_DESC(ccid3_debug, "Enable debug messages");
>  #endif
> --- a/net/dccp/ccids/ccid3.h
> +++ b/net/dccp/ccids/ccid3.h
> @@ -61,6 +61,13 @@
>                         rtt = CCID3_SANE_RTT_MAX;                          \
>                 }                                       } while (0)
>
> +#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
> +extern int ccid3_debug;
> +#define ccid3_pr_debug(format, a...)   DCCP_PR_DEBUG(ccid3_debug, format, ##a)
> +#else
> +#define ccid3_pr_debug(format, a...)
> +#endif
> +
>  enum ccid3_options {
>         TFRC_OPT_LOSS_EVENT_RATE = 192,
>         TFRC_OPT_LOSS_INTERVALS  = 193,
> -

-- 
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group

Re: [PATCH 5/8]: Move debugging macro to header file

[Gerrit Renker]

Shame on me - I think I forgot the EXPORT_SYMBOL. Can you please try the latest uploaded
version - I have fixed it there. 
Gerrit

Quoting Ian McDonald:
|  OK. Go to use this in net/dccp/ccids/lib/loss_interval.c and get this:
|  WARNING: "ccid3_debug" [net/dccp/ccids/lib/dccp_tfrc_lib.ko] undefined!
|  
|  So I think I'll just do this in ccid3.c
|  EXPORT_SYMBOL_GPL(ccid3_debug);
|  
|  and now I get this:
|  WARNING: Module
|  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/lib/dccp_tfrc_lib.ko
|  ignored, due to loop
|  WARNING: Loop detected:
|  /home/ian/tmp/lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
|  needs dccp_tfrc_lib.ko which needs dccp_ccid3.ko again!
|  WARNING: Module
|  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
|  ignored, due to loop
|  
|  Hmm... what to do now? These need refactoring anyway but I was hoping
|  not to have to do that now.
|  
|  Regards,
|  
|  Ian
|  
|  On 12/15/06, Gerrit Renker <gerrit@erg.abdn.ac.uk> wrote:
|  > [CCID3]: Move debugging macro to header file
|  >
|  > This moves the ccid3_pr_debug macro into the header file,
|  > so that it can be used from other files belonging to the
|  > CCID3 framework as well.
|  >
|  > Thanks to Ian McDonald for the suggestion.
|  >
|  > Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
|  > --- a/net/dccp/ccids/ccid3.c
|  > +++ b/net/dccp/ccids/ccid3.c
|  > @@ -41,13 +41,6 @@
|  >  #include "lib/tfrc.h"
|  >  #include "ccid3.h"
|  >
|  > -#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
|  > -static int ccid3_debug;
|  > -#define ccid3_pr_debug(format, a...)   DCCP_PR_DEBUG(ccid3_debug, format, ##a)
|  > -#else
|  > -#define ccid3_pr_debug(format, a...)
|  > -#endif
|  > -
|  >  static struct dccp_tx_hist *ccid3_tx_hist;
|  >  static struct dccp_rx_hist *ccid3_rx_hist;
|  >  static struct dccp_li_hist *ccid3_li_hist;
|  > @@ -1227,6 +1220,7 @@ static struct ccid_operations ccid3 = {
|  >  };
|  >
|  >  #ifdef CONFIG_IP_DCCP_CCID3_DEBUG
|  > +int ccid3_debug;
|  >  module_param(ccid3_debug, int, 0444);
|  >  MODULE_PARM_DESC(ccid3_debug, "Enable debug messages");
|  >  #endif
|  > --- a/net/dccp/ccids/ccid3.h
|  > +++ b/net/dccp/ccids/ccid3.h
|  > @@ -61,6 +61,13 @@
|  >                         rtt = CCID3_SANE_RTT_MAX;                          \
|  >                 }                                       } while (0)
|  >
|  > +#ifdef CONFIG_IP_DCCP_CCID3_DEBUG
|  > +extern int ccid3_debug;
|  > +#define ccid3_pr_debug(format, a...)   DCCP_PR_DEBUG(ccid3_debug, format, ##a)
|  > +#else
|  > +#define ccid3_pr_debug(format, a...)
|  > +#endif
|  > +
|  >  enum ccid3_options {
|  >         TFRC_OPT_LOSS_EVENT_RATE = 192,
|  >         TFRC_OPT_LOSS_INTERVALS  = 193,
|  > -
|  

Re: [PATCH 5/8]: Move debugging macro to header file

[Ian McDonald]

On 12/19/06, Gerrit Renker <gerrit@erg.abdn.ac.uk> wrote:
> Shame on me - I think I forgot the EXPORT_SYMBOL. Can you please try the latest uploaded
> version - I have fixed it there.
> Gerrit

But the EXPORT_SYMBOL_GPL doesn't fix this:
> |  and now I get this:
> |  WARNING: Module
> |  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/lib/dccp_tfrc_lib.ko
> |  ignored, due to loop
> |  WARNING: Loop detected:
> |  /home/ian/tmp/lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
> |  needs dccp_tfrc_lib.ko which needs dccp_ccid3.ko again!
> |  WARNING: Module
> |  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
> |  ignored, due to loop
> |
-- 
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group

Re: [PATCH 5/8]: Move debugging macro to header file

[Gerrit Renker]

Can you please tell me what exactly you are using -- on my computer it compiles without a single error.
 
|  But the EXPORT_SYMBOL_GPL doesn't fix this:
|  > |  and now I get this:
|  > |  WARNING: Module
|  > |  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/lib/dccp_tfrc_lib.ko
|  > |  ignored, due to loop
|  > |  WARNING: Loop detected:
|  > |  /home/ian/tmp/lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
|  > |  needs dccp_tfrc_lib.ko which needs dccp_ccid3.ko again!
|  > |  WARNING: Module
|  > |  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
|  > |  ignored, due to loop
|  > |

Re: [PATCH 5/8]: Move debugging macro to header file

[Ian McDonald]

Gerrit,

From memory it is when I do make modules_install that it fails as it
is a linking issue not a compiling issue. The relevant part of the
config is that I've got CCID3 debugging turned on of course.

Ian

On 12/19/06, Gerrit Renker <gerrit@erg.abdn.ac.uk> wrote:
> Can you please tell me what exactly you are using -- on my computer it compiles without a single error.
>
> |  But the EXPORT_SYMBOL_GPL doesn't fix this:
> |  > |  and now I get this:
> |  > |  WARNING: Module
> |  > |  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/lib/dccp_tfrc_lib.ko
> |  > |  ignored, due to loop
> |  > |  WARNING: Loop detected:
> |  > |  /home/ian/tmp/lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
> |  > |  needs dccp_tfrc_lib.ko which needs dccp_ccid3.ko again!
> |  > |  WARNING: Module
> |  > |  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
> |  > |  ignored, due to loop
> |  > |
>


-- 
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group

Re: [PATCH 5/8]: Move debugging macro to header file

[Arnaldo Carvalho de Melo]

On 12/19/06, Ian McDonald <ian.mcdonald@jandi.co.nz> wrote:
> Gerrit,
>
> From memory it is when I do make modules_install that it fails as it
> is a linking issue not a compiling issue. The relevant part of the
> config is that I've got CCID3 debugging turned on of course.

The loop comes because dccp_ccid3.ko needs symbols provided by
dccp_tfrc_lib.ko, so if we try to export ccid3_pr_debug to be used by
dccp_tfrc_lib.ko we'll get the loop, so I guess the right thing to do
is to introduce tfrc_pr_debug, that will give us more flexibility,
allowing one to select ccid3 debugging, tfrc debugging, both or none.

- Arnaldo

Re: [PATCH 5/8]: Move debugging macro to header file

[Ian McDonald]

On 12/20/06, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote:
> The loop comes because dccp_ccid3.ko needs symbols provided by
> dccp_tfrc_lib.ko, so if we try to export ccid3_pr_debug to be used by
> dccp_tfrc_lib.ko we'll get the loop, so I guess the right thing to do
> is to introduce tfrc_pr_debug, that will give us more flexibility,
> allowing one to select ccid3 debugging, tfrc debugging, both or none.
>
> - Arnaldo
>
I think the right thing to do is not to introduce another level of debugging.

People want to debug or they don't in my opinion. I think we should do
away with ccid3_pr_debug and ccid2_pr_debug. I always turn them all on
or all off when working with testing (or add my own statements in).

Ian
-- 
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group

Re: [PATCH 5/8]: Move debugging macro to header file

[Arnaldo Carvalho de Melo]

On 12/19/06, Ian McDonald <ian.mcdonald@jandi.co.nz> wrote:
> On 12/20/06, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote:
> > The loop comes because dccp_ccid3.ko needs symbols provided by
> > dccp_tfrc_lib.ko, so if we try to export ccid3_pr_debug to be used by
> > dccp_tfrc_lib.ko we'll get the loop, so I guess the right thing to do
> > is to introduce tfrc_pr_debug, that will give us more flexibility,
> > allowing one to select ccid3 debugging, tfrc debugging, both or none.
> >
> > - Arnaldo
> >
> I think the right thing to do is not to introduce another level of debugging.
>
> People want to debug or they don't in my opinion. I think we should do
> away with ccid3_pr_debug and ccid2_pr_debug. I always turn them all on
> or all off when working with testing (or add my own statements in).

If the way to go is a boolean, i.e. to debug or not to debug we have
to remove ccid{2,3}_pr_debug and stick to using dccp_pr_debug
everywhere, that would eliminate the loop as dccp.ko doesn't directly
uses any code from dccp_ipv[4,6]. ccid[2, 3] or tfrc.

But I think that being able to debug just the dccp core, or just
ccid3, or just tfrc is better.

- Arnaldo

Re: [PATCH 5/8]: Move debugging macro to header file

[Ian McDonald]

On 12/20/06, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote:
> > I think the right thing to do is not to introduce another level of debugging.
> >
> > People want to debug or they don't in my opinion. I think we should do
> > away with ccid3_pr_debug and ccid2_pr_debug. I always turn them all on
> > or all off when working with testing (or add my own statements in).
>
> If the way to go is a boolean, i.e. to debug or not to debug we have
> to remove ccid{2,3}_pr_debug and stick to using dccp_pr_debug
> everywhere, that would eliminate the loop as dccp.ko doesn't directly
> uses any code from dccp_ipv[4,6]. ccid[2, 3] or tfrc.
>
Agree and that's what I prefer.

> But I think that being able to debug just the dccp core, or just
> ccid3, or just tfrc is better.
>
I'll go with your choice on this one. In the interim I'll carry on
using dccp_pr_debug for tfrc debugging as short on time.

Ian
-- 
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group

Re: [PATCH 5/8]: Move debugging macro to header file

[Arnaldo Carvalho de Melo]

On 12/19/06, Ian McDonald <ian.mcdonald@jandi.co.nz> wrote:
> On 12/20/06, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote:
> > > I think the right thing to do is not to introduce another level of debugging.
> > >
> > > People want to debug or they don't in my opinion. I think we should do
> > > away with ccid3_pr_debug and ccid2_pr_debug. I always turn them all on
> > > or all off when working with testing (or add my own statements in).
> >
> > If the way to go is a boolean, i.e. to debug or not to debug we have
> > to remove ccid{2,3}_pr_debug and stick to using dccp_pr_debug
> > everywhere, that would eliminate the loop as dccp.ko doesn't directly
> > uses any code from dccp_ipv[4,6]. ccid[2, 3] or tfrc.
> >
> Agree and that's what I prefer.
>
> > But I think that being able to debug just the dccp core, or just
> > ccid3, or just tfrc is better.
> >
> I'll go with your choice on this one. In the interim I'll carry on
> using dccp_pr_debug for tfrc debugging as short on time.

Agreed, in the short term just use dccp_pr_debug in tfrc, it should just work.

- Arnaldo

Re: [PATCH 5/8]: Move debugging macro to header file

[Ian McDonald]

On 12/20/06, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote:
> Agreed, in the short term just use dccp_pr_debug in tfrc, it should just work.
>
Yes it does.
-- 
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group

Re: [PATCH 5/8]: Move debugging macro to header file

[Gerrit Renker]

You are right, I have tested this. Given that this patch is of no use then, 
I would like to retract it (it is no longer online).
With regard to the short-term solution: at some point of time, say middle
January ... begin February, I would like to toss out all unnecessary debugging
statements in ccid3 - the amount of debugging output at the moment is enormous
and overwhelming.

Quoting Ian McDonald:
|  Gerrit,
|  
|  From memory it is when I do make modules_install that it fails as it
|  is a linking issue not a compiling issue. The relevant part of the
|  config is that I've got CCID3 debugging turned on of course.
|  
|  Ian
|  
|  On 12/19/06, Gerrit Renker <gerrit@erg.abdn.ac.uk> wrote:
|  > Can you please tell me what exactly you are using -- on my computer it compiles without a single error.
|  >
|  > |  But the EXPORT_SYMBOL_GPL doesn't fix this:
|  > |  > |  and now I get this:
|  > |  > |  WARNING: Module
|  > |  > |  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/lib/dccp_tfrc_lib.ko
|  > |  > |  ignored, due to loop
|  > |  > |  WARNING: Loop detected:
|  > |  > |  /home/ian/tmp/lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
|  > |  > |  needs dccp_tfrc_lib.ko which needs dccp_ccid3.ko again!
|  > |  > |  WARNING: Module
|  > |  > |  /lib/modules/2.6.20-rc1davem20/kernel/net/dccp/ccids/dccp_ccid3.ko
|  > |  > |  ignored, due to loop
|  > |  > |
|  >
|  
|  

Re: [PATCH 5/8]: Move debugging macro to header file

[Ian McDonald]

On 12/22/06, Gerrit Renker <gerrit@erg.abdn.ac.uk> wrote:
> You are right, I have tested this. Given that this patch is of no use then,
> I would like to retract it (it is no longer online).
> With regard to the short-term solution: at some point of time, say middle
> January ... begin February, I would like to toss out all unnecessary debugging
> statements in ccid3 - the amount of debugging output at the moment is enormous
> and overwhelming.
>
I'm finding the amount of debugging output great but understand where
you are coming from...

I'm happy to get them removed once we fix up a few more issues. If
people want it removed sooner I can always put the debugging in my own
tree.

Ian
-- 
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group