ALSA: Make snd_pcm_debug_name usable outside pcm_lib
PATCH 1/1 ALSA: Make snd_pcm_debug_name usable outside pcm_lib
From: Eliot Blennerhassett <[email protected]>
Formatting a PCM name is useful for module debug too. Add snd_prefix when making function public.
--- include/sound/pcm.h | 12 ++++++++++++ sound/core/pcm_lib.c | 10 +++++----- sound/pci/asihpi/asihpi.c | 21 --------------------- 3 files changed, 17 insertions(+), 26 deletions(-)
include/sound/pcm.h +12 -0
@@ -507,6 +507,18 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream);void snd_pcm_vma_notify_data (void *client,void *data);int snd_pcm_mmap_data (struct snd_pcm_substream *substream,struct file *file,struct vm_area_struct *area); + +#if definedCONFIG_SND_DEBUG +void snd_pcm_debug_name (struct snd_pcm_substream *substream, +char *name,size_t len); +#else +static inline void +snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) +{ + *buf =0 ; +} +#endif +/* * PCM library */
sound/core/pcm_lib.c +5 -5
@@ -128,7 +128,7 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram } } -static void pcm_debug_name (struct snd_pcm_substream *substream, +void snd_pcm_debug_name (struct snd_pcm_substream *substream,char *name,size_t len) { snprintf(name, len, "pcmC%dD%d%c:%d",
@@ -168,7 +168,7 @@ static void xrun(struct snd_pcm_substream *substream)snd_pcm_stop (substream,SNDRV_PCM_STATE_XRUN );if (xrun_debug (substream,XRUN_DEBUG_BASIC )) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));snd_printd (KERN_DEBUG "XRUN: %s\n" , name);dump_stack_on_xrun (substream); }
@@ -243,7 +243,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)return ;if (xrun_debug (substream,XRUN_DEBUG_LOGONCE ) && log->hit)return ; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));for (cnt =0 , idx = log->idx; cnt <XRUN_LOG_CNT ; cnt++) { entry = &log->entries[idx];if (entry->period_size ==0 )
@@ -319,7 +319,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,if (pos >= runtime->buffer_size) {if (printk_ratelimit ()) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));xrun_log_show (substream); snd_printd(KERN_ERR "BUG: %s, pos = %ld, " "buffer size = %ld, period size = %ld\n",
@@ -364,7 +364,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,if (xrun_debug (substream, in_interrupt ?XRUN_DEBUG_PERIODUPDATE :XRUN_DEBUG_HWPTRUPDATE )) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name)); snd_printd("%s_update: %s: pos=%u/%u/%u, " "hwptr=%ld/%ld/%ld/%ld\n", in_interrupt ? "period" : "hwptr",
sound/pci/asihpi/asihpi.c +0 -21
@@ -41,31 +41,10 @@#include <sound/tlv.h> #include <sound/hwdep.h> -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("AudioScience inc. <[email protected]>" );MODULE_DESCRIPTION ("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx" ); -#if definedCONFIG_SND_DEBUG -/* copied from pcm_lib.c, hope later patch will make that version public -and this copy can be removed */ -static inline void -snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) -{ -snprintf (buf, size,"pcmC%dD%d%c:%d" , - substream->pcm->card->number, - substream->pcm->device, - substream->stream ?'c' :'p' , - substream->number); -} -#else -static inline void -snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) -{ - *buf =0 ; -} -#endif -#if definedCONFIG_SND_DEBUG_VERBOSE /** * snd_printddd - very verbose debug printk
Signature · 1 line
1.7.0.4
At Fri, 22 Jul 2011 22:05:26 +1200,
Quoted 7 lines · [email protected] wrote:
From: Eliot Blennerhassett <[email protected]>
Formatting a PCM name is useful for module debug too. Add
snd_prefixwhen making function public.Signed-off-by Eliot Blennerhassett <[email protected]>
It'd need EXPORT_SYMBOL*() in addition.
Or, this can be defined as an inline function.
It's just a call of snprintf() with the passed arguments, after all.
thanks,
Takashi
Quoted 117 lines
--- include/sound/pcm.h | 12 ++++++++++++ sound/core/pcm_lib.c | 10 +++++----- sound/pci/asihpi/asihpi.c | 21 --------------------- 3 files changed, 17 insertions(+), 26 deletions(-)include/sound/pcm.h +12
-0@@ -507,6 +507,18 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream);void snd_pcm_vma_notify_data (void *client,void *data);int snd_pcm_mmap_data (struct snd_pcm_substream *substream,struct file *file,struct vm_area_struct *area); + +#if definedCONFIG_SND_DEBUG +void snd_pcm_debug_name (struct snd_pcm_substream *substream, +char *name,size_t len); +#else +static inline void +snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) +{ + *buf =0 ; +} +#endif +/* * PCM library */ sound/core/pcm_lib.c +5
-5@@ -128,7 +128,7 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram } } -static void pcm_debug_name (struct snd_pcm_substream *substream, +void snd_pcm_debug_name (struct snd_pcm_substream *substream,char *name,size_t len) { snprintf(name, len, "pcmC%dD%d%c:%d",@@ -168,7 +168,7 @@ static void xrun(struct snd_pcm_substream *substream)snd_pcm_stop (substream,SNDRV_PCM_STATE_XRUN );if (xrun_debug (substream,XRUN_DEBUG_BASIC )) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));snd_printd (KERN_DEBUG "XRUN: %s\n" , name);dump_stack_on_xrun (substream); }@@ -243,7 +243,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)return ;if (xrun_debug (substream,XRUN_DEBUG_LOGONCE ) && log->hit)return ; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));for (cnt =0 , idx = log->idx; cnt <XRUN_LOG_CNT ; cnt++) { entry = &log->entries[idx];if (entry->period_size ==0 )@@ -319,7 +319,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,if (pos >= runtime->buffer_size) {if (printk_ratelimit ()) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));xrun_log_show (substream); snd_printd(KERN_ERR "BUG: %s, pos = %ld, " "buffer size = %ld, period size = %ld\n",@@ -364,7 +364,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,if (xrun_debug (substream, in_interrupt ?XRUN_DEBUG_PERIODUPDATE :XRUN_DEBUG_HWPTRUPDATE )) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name)); snd_printd("%s_update: %s: pos=%u/%u/%u, " "hwptr=%ld/%ld/%ld/%ld\n", in_interrupt ? "period" : "hwptr",sound/pci/asihpi/asihpi.c +0
-21@@ -41,31 +41,10 @@#include <sound/tlv.h> #include <sound/hwdep.h> -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("AudioScience inc. <[email protected]>" );MODULE_DESCRIPTION ("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx" ); -#if definedCONFIG_SND_DEBUG -/* copied from pcm_lib.c, hope later patch will make that version public -and this copy can be removed */ -static inline void -snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) -{ -snprintf (buf, size,"pcmC%dD%d%c:%d" , - substream->pcm->card->number, - substream->pcm->device, - substream->stream ?'c' :'p' , - substream->number); -} -#else -static inline void -snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) -{ - *buf =0 ; -} -#endif -#if definedCONFIG_SND_DEBUG_VERBOSE /** * snd_printddd - very verbose debug printk Signature · 1 line
1.7.0.4
Quoted 8 lines · Takashi Iwai
At Fri, 22 Jul 2011 22:05:26 +1200,
Quoted 6 lines · [email protected] wrote:
From: Eliot Blennerhassett <[email protected]>
Formatting a PCM name is useful for module debug too. Add
snd_prefixwhen making function public.
Quoted 6 lines
Quoted 1 line
Signed-off-by Eliot Blennerhassett <[email protected]>It'd need EXPORT_SYMBOL*() in addition.
Or, this can be defined as an inline function.
It's just a call ofsnprintf()with the passed arguments, after all.
Hmm. A side-effect of doing it this way is to make pcm.h depend on core.h, (for substream->pcm->card->number) and there are some files that include pcm.h but not core.h. E.g. pcsp_lib.c, ctvmem.c, oxygen_lib.c (and quite a few other possible candidate)
Fix these, or go with the original non-inline version?
--
Eliot
PATCH v2 1/1 ALSA: Make snd_pcm_debug_name usable outside pcm_lib
In reply to Takashi IwaiFrom: Eliot Blennerhassett <[email protected]>
Formatting a PCM name is useful for module debug too. Add snd_prefix when making function public.
--- include/sound/pcm.h | 12 ++++++++++++ sound/core/pcm_lib.c | 14 +++++++++----- sound/pci/asihpi/asihpi.c | 21 --------------------- 3 files changed, 21 insertions(+), 26 deletions(-)
include/sound/pcm.h +12 -0
@@ -507,6 +507,18 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream);void snd_pcm_vma_notify_data (void *client,void *data);int snd_pcm_mmap_data (struct snd_pcm_substream *substream,struct file *file,struct vm_area_struct *area); + +#if definedCONFIG_SND_DEBUG +void snd_pcm_debug_name (struct snd_pcm_substream *substream, +char *name,size_t len); +#else +static inline void +snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) +{ + *buf =0 ; +} +#endif +/* * PCM library */
sound/core/pcm_lib.c +9 -5
@@ -128,7 +128,8 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram } } -static void pcm_debug_name (struct snd_pcm_substream *substream, +#if definedCONFIG_SND_DEBUG +void snd_pcm_debug_name (struct snd_pcm_substream *substream,char *name,size_t len) { snprintf(name, len, "pcmC%dD%d%c:%d",
@@ -138,6 +139,9 @@ static void pcm_debug_name(struct snd_pcm_substream *substream, substream->number); } +EXPORT_SYMBOL (snd_pcm_debug_name); +#endif +#define XRUN_DEBUG_BASIC (1<<0)#define XRUN_DEBUG_STACK (1<<1)/* dump also stack */ #define XRUN_DEBUG_JIFFIESCHECK (1<<2)/* do jiffies check */
@@ -168,7 +172,7 @@ static void xrun(struct snd_pcm_substream *substream)snd_pcm_stop (substream,SNDRV_PCM_STATE_XRUN );if (xrun_debug (substream,XRUN_DEBUG_BASIC )) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));snd_printd (KERN_DEBUG "XRUN: %s\n" , name);dump_stack_on_xrun (substream); }
@@ -243,7 +247,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)return ;if (xrun_debug (substream,XRUN_DEBUG_LOGONCE ) && log->hit)return ; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));for (cnt =0 , idx = log->idx; cnt <XRUN_LOG_CNT ; cnt++) { entry = &log->entries[idx];if (entry->period_size ==0 )
@@ -319,7 +323,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,if (pos >= runtime->buffer_size) {if (printk_ratelimit ()) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));xrun_log_show (substream); snd_printd(KERN_ERR "BUG: %s, pos = %ld, " "buffer size = %ld, period size = %ld\n",
@@ -364,7 +368,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,if (xrun_debug (substream, in_interrupt ?XRUN_DEBUG_PERIODUPDATE :XRUN_DEBUG_HWPTRUPDATE )) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name)); snd_printd("%s_update: %s: pos=%u/%u/%u, " "hwptr=%ld/%ld/%ld/%ld\n", in_interrupt ? "period" : "hwptr",
sound/pci/asihpi/asihpi.c +0 -21
@@ -41,31 +41,10 @@#include <sound/tlv.h> #include <sound/hwdep.h> -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("AudioScience inc. <[email protected]>" );MODULE_DESCRIPTION ("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx" ); -#if definedCONFIG_SND_DEBUG -/* copied from pcm_lib.c, hope later patch will make that version public -and this copy can be removed */ -static inline void -snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) -{ -snprintf (buf, size,"pcmC%dD%d%c:%d" , - substream->pcm->card->number, - substream->pcm->device, - substream->stream ?'c' :'p' , - substream->number); -} -#else -static inline void -snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) -{ - *buf =0 ; -} -#endif -#if definedCONFIG_SND_DEBUG_VERBOSE /** * snd_printddd - very verbose debug printk
Signature · 1 line
1.7.0.4
Takashi Iwai
AppliedAt Sat, 23 Jul 2011 12:36:25 +1200,
Quoted 7 lines · [email protected] wrote:
From: Eliot Blennerhassett <[email protected]>
Formatting a PCM name is useful for module debug too. Add
snd_prefixwhen making function public.Signed-off-by Eliot Blennerhassett <[email protected]>
Thanks, applied now with minor coding-style changes.
Takashi
Quoted 128 lines
--- include/sound/pcm.h | 12 ++++++++++++ sound/core/pcm_lib.c | 14 +++++++++----- sound/pci/asihpi/asihpi.c | 21 --------------------- 3 files changed, 21 insertions(+), 26 deletions(-)include/sound/pcm.h +12
-0@@ -507,6 +507,18 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream);void snd_pcm_vma_notify_data (void *client,void *data);int snd_pcm_mmap_data (struct snd_pcm_substream *substream,struct file *file,struct vm_area_struct *area); + +#if definedCONFIG_SND_DEBUG +void snd_pcm_debug_name (struct snd_pcm_substream *substream, +char *name,size_t len); +#else +static inline void +snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) +{ + *buf =0 ; +} +#endif +/* * PCM library */ sound/core/pcm_lib.c +9
-5@@ -128,7 +128,8 @@ void snd_pcm_playback_silence(struct snd_pcm_substream *substream, snd_pcm_ufram } } -static void pcm_debug_name (struct snd_pcm_substream *substream, +#if definedCONFIG_SND_DEBUG +void snd_pcm_debug_name (struct snd_pcm_substream *substream,char *name,size_t len) { snprintf(name, len, "pcmC%dD%d%c:%d",@@ -138,6 +139,9 @@ static void pcm_debug_name(struct snd_pcm_substream *substream, substream->number); } +EXPORT_SYMBOL (snd_pcm_debug_name); +#endif +#define XRUN_DEBUG_BASIC (1<<0)#define XRUN_DEBUG_STACK (1<<1)/* dump also stack */ #define XRUN_DEBUG_JIFFIESCHECK (1<<2)/* do jiffies check */ @@ -168,7 +172,7 @@ static void xrun(struct snd_pcm_substream *substream)snd_pcm_stop (substream,SNDRV_PCM_STATE_XRUN );if (xrun_debug (substream,XRUN_DEBUG_BASIC )) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));snd_printd (KERN_DEBUG "XRUN: %s\n" , name);dump_stack_on_xrun (substream); }@@ -243,7 +247,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)return ;if (xrun_debug (substream,XRUN_DEBUG_LOGONCE ) && log->hit)return ; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));for (cnt =0 , idx = log->idx; cnt <XRUN_LOG_CNT ; cnt++) { entry = &log->entries[idx];if (entry->period_size ==0 )@@ -319,7 +323,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,if (pos >= runtime->buffer_size) {if (printk_ratelimit ()) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name));xrun_log_show (substream); snd_printd(KERN_ERR "BUG: %s, pos = %ld, " "buffer size = %ld, period size = %ld\n",@@ -364,7 +368,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,if (xrun_debug (substream, in_interrupt ?XRUN_DEBUG_PERIODUPDATE :XRUN_DEBUG_HWPTRUPDATE )) {char name[16 ]; -pcm_debug_name (substream, name,sizeof (name)); +snd_pcm_debug_name (substream, name,sizeof (name)); snd_printd("%s_update: %s: pos=%u/%u/%u, " "hwptr=%ld/%ld/%ld/%ld\n", in_interrupt ? "period" : "hwptr",sound/pci/asihpi/asihpi.c +0
-21@@ -41,31 +41,10 @@#include <sound/tlv.h> #include <sound/hwdep.h> -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("AudioScience inc. <[email protected]>" );MODULE_DESCRIPTION ("AudioScience ALSA ASI5000 ASI6000 ASI87xx ASI89xx" ); -#if definedCONFIG_SND_DEBUG -/* copied from pcm_lib.c, hope later patch will make that version public -and this copy can be removed */ -static inline void -snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) -{ -snprintf (buf, size,"pcmC%dD%d%c:%d" , - substream->pcm->card->number, - substream->pcm->device, - substream->stream ?'c' :'p' , - substream->number); -} -#else -static inline void -snd_pcm_debug_name (struct snd_pcm_substream *substream,char *buf,size_t size) -{ - *buf =0 ; -} -#endif -#if definedCONFIG_SND_DEBUG_VERBOSE /** * snd_printddd - very verbose debug printk Signature · 1 line
1.7.0.4