From: David Goulet <dgoulet@efficios.com>
Date: Tue, 20 Mar 2012 18:35:38 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0.0-rc4~13
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=0cd3b1d4a59305a7efb608605d2e74c0ea347383;hp=-c

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

0cd3b1d4a59305a7efb608605d2e74c0ea347383
diff --combined src/bin/lttng-sessiond/kernel.c
index dd815c445,1aad5263e..596af588c
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@@ -25,7 -25,6 +25,7 @@@
  
  #include <common/common.h>
  #include <common/kernel-ctl/kernel-ctl.h>
 +#include <common/sessiond-comm/sessiond-comm.h>
  
  #include "kernel.h"
  #include "kern-modules.h"
@@@ -291,15 -290,8 +291,15 @@@ int kernel_enable_event(struct ltt_kern
  	int ret;
  
  	ret = kernctl_enable(event->fd);
 -	if (ret < 0 && errno != EEXIST) {
 -		PERROR("enable kernel event");
 +	if (ret < 0) {
 +		switch (errno) {
 +		case EEXIST:
 +			ret = LTTCOMM_KERN_EVENT_EXIST;
 +			break;
 +		default:
 +			PERROR("enable kernel event");
 +			break;
 +		}
  		goto error;
  	}
  
@@@ -320,15 -312,8 +320,15 @@@ int kernel_disable_event(struct ltt_ker
  	int ret;
  
  	ret = kernctl_disable(event->fd);
 -	if (ret < 0 && errno != EEXIST) {
 -		PERROR("disable kernel event");
 +	if (ret < 0) {
 +		switch (errno) {
 +		case EEXIST:
 +			ret = LTTCOMM_KERN_EVENT_EXIST;
 +			break;
 +		default:
 +			PERROR("disable kernel event");
 +			break;
 +		}
  		goto error;
  	}
  
@@@ -597,24 -582,35 +597,35 @@@ ssize_t kernel_list_events(int tracer_f
  	 */
  	nbmem = KERNEL_EVENT_INIT_LIST_SIZE;
  	elist = zmalloc(sizeof(struct lttng_event) * nbmem);
+ 	if (elist == NULL) {
+ 		PERROR("alloc list events");
+ 		count = -ENOMEM;
+ 		goto end;
+ 	}
  
  	while ((size = fscanf(fp, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) {
  		if (count >= nbmem) {
+ 			struct lttng_event *new_elist;
+ 
  			DBG("Reallocating event list from %zu to %zu bytes", nbmem,
  					nbmem * 2);
  			/* Double the size */
  			nbmem <<= 1;
- 			elist = realloc(elist, nbmem * sizeof(struct lttng_event));
- 			if (elist == NULL) {
+ 			new_elist = realloc(elist, nbmem * sizeof(struct lttng_event));
+ 			if (new_elist == NULL) {
  				PERROR("realloc list events");
+ 				free(event);
+ 				free(elist);
  				count = -ENOMEM;
  				goto end;
  			}
+ 			elist = new_elist;
  		}
  		strncpy(elist[count].name, event, LTTNG_SYMBOL_NAME_LEN);
  		elist[count].name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
  		elist[count].enabled = -1;
  		count++;
+ 		free(event);
  	}
  
  	*events = elist;