Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cd641ed authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcm: trace XRUN event at injection, too 



The PCM xrun injection triggers directly snd_pcm_stop() without the
standard xrun handler, hence it's not recorded on the event buffer.
Ditto for snd_pcm_stop_xrun() call and SNDRV_PCM_IOCTL_XRUN ioctl.
They are inconvenient from the debugging POV.

Let's make them to trigger XRUN via the standard helper more
consistently.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 51d7d358

sound/core/pcm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -497,7 +497,7 @@ static void snd_pcm_xrun_injection_write(struct snd_info_entry *entry, 
	snd_pcm_stream_lock_irq(substream);

	snd_pcm_stream_lock_irq(substream);

	runtime = substream->runtime;

	runtime = substream->runtime;

	if (runtime && runtime->status->state == SNDRV_PCM_STATE_RUNNING)

	if (runtime && runtime->status->state == SNDRV_PCM_STATE_RUNNING)

		snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);

		__snd_pcm_xrun(substream);

	snd_pcm_stream_unlock_irq(substream);

	snd_pcm_stream_unlock_irq(substream);

}

}

sound/core/pcm_lib.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -153,7 +153,8 @@ EXPORT_SYMBOL(snd_pcm_debug_name); 
			dump_stack();				\

			dump_stack();				\

	} while (0)

	} while (0)





static void xrun(struct snd_pcm_substream *substream)

/* call with stream lock held */

void __snd_pcm_xrun(struct snd_pcm_substream *substream)

{

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -201,7 +202,7 @@ int snd_pcm_update_state(struct snd_pcm_substream *substream, 
		}

		}

	} else {

	} else {

		if (avail >= runtime->stop_threshold) {

		if (avail >= runtime->stop_threshold) {

			xrun(substream);

			__snd_pcm_xrun(substream);

			return -EPIPE;

			return -EPIPE;

		}

		}

	}

	}
@@ -297,7 +298,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
	}

	}





	if (pos == SNDRV_PCM_POS_XRUN) {

	if (pos == SNDRV_PCM_POS_XRUN) {

		xrun(substream);

		__snd_pcm_xrun(substream);

		return -EPIPE;

		return -EPIPE;

	}

	}

	if (pos >= runtime->buffer_size) {

	if (pos >= runtime->buffer_size) {

sound/core/pcm_local.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -65,4 +65,6 @@ static inline void snd_pcm_timer_init(struct snd_pcm_substream *substream) {} 
static inline void snd_pcm_timer_done(struct snd_pcm_substream *substream) {}

static inline void snd_pcm_timer_done(struct snd_pcm_substream *substream) {}

#endif

#endif





void __snd_pcm_xrun(struct snd_pcm_substream *substream);



#endif	/* __SOUND_CORE_PCM_LOCAL_H */
 
#endif	/* __SOUND_CORE_PCM_LOCAL_H */

sound/core/pcm_native.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1337,13 +1337,12 @@ int snd_pcm_drain_done(struct snd_pcm_substream *substream) 
int snd_pcm_stop_xrun(struct snd_pcm_substream *substream)

int snd_pcm_stop_xrun(struct snd_pcm_substream *substream)

{

{

	unsigned long flags;

	unsigned long flags;

	int ret = 0;





	snd_pcm_stream_lock_irqsave(substream, flags);

	snd_pcm_stream_lock_irqsave(substream, flags);

	if (snd_pcm_running(substream))

	if (snd_pcm_running(substream))

		ret = snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);

		__snd_pcm_xrun(substream);

	snd_pcm_stream_unlock_irqrestore(substream, flags);

	snd_pcm_stream_unlock_irqrestore(substream, flags);

	return ret;

	return 0;

}

}

EXPORT_SYMBOL_GPL(snd_pcm_stop_xrun);

EXPORT_SYMBOL_GPL(snd_pcm_stop_xrun);
@@ -1591,7 +1590,8 @@ static int snd_pcm_xrun(struct snd_pcm_substream *substream) 
		result = 0;	/* already there */

		result = 0;	/* already there */

		break;

		break;

	case SNDRV_PCM_STATE_RUNNING:

	case SNDRV_PCM_STATE_RUNNING:

		result = snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);

		__snd_pcm_xrun(substream);

		result = 0;

		break;

		break;

	default:

	default:

		result = -EBADFD;

		result = -EBADFD;