[PATCH] dix: be more verbose when we run out of opcodes

[Julien Cristau]

On Fri, Mar 12, 2010 at 12:01:41 -0300, Paulo Ricardo Zanoni wrote:

> From: Paulo Ricardo Zanoni <pzanoni at mandriva.com>
> Date: Thu, 11 Mar 2010 14:28:18 -0300
> Subject: [PATCH] dix: be more verbose when we run out of opcodes
> 
> If we run out of opcodes, nothing is print on the log, making the
> problem hard to debug. In the current Xserver, if you enable some
> extensions like multibuffer (+2 events) and use nvidia binary driver (+5
> events) you can run out of opcode numbers.
> 
> Signed-off-by: Paulo Ricardo Zanoni <pzanoni at mandriva.com>
> ---
>  dix/extension.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/dix/extension.c b/dix/extension.c
> index fb83af1..30dc313 100644
> --- a/dix/extension.c
> +++ b/dix/extension.c
> @@ -83,8 +83,11 @@ AddExtension(char *name, int NumEvents, int NumErrors,
>      if (!MainProc || !SwappedMainProc || !MinorOpcodeProc)
>          return((ExtensionEntry *) NULL);
>      if ((lastEvent + NumEvents > LAST_EVENT) || 
> -	        (unsigned)(lastError + NumErrors > LAST_ERROR))
> +	        (unsigned)(lastError + NumErrors > LAST_ERROR)) {
> +	LogMessage(X_ERROR, "Not enabling extension %s: maximum number of "
> +		   "events or errors exceeded.\n", name);

funky whitespace on the LogMessage (not the same as the return below).

>          return((ExtensionEntry *) NULL);
> +    }
>  
>      ext = xalloc(sizeof(ExtensionEntry));
>      if (!ext)

With that fixed,
Reviewed-by: Julien Cristau <jcristau at debian.org>

Cheers,
Julien
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100312/56ae88e8/attachment-0001.pgp>