Merge branch 'Z2' of https://github.com/skysql/MaxScale into Z2

Conflicts:
	client/Makefile
	server/core/buffer.c
	server/core/test/makefile
	server/include/buffer.h
	server/modules/filter/Makefile
	server/modules/routing/webserver.c

server/core/buffer.c

@@ -32,6 +32,7 @@
  * 11/07/13	Mark Riddoch		Add reference count mechanism
  * 16/07/2013	Massimiliano Pinto	Added command type to gwbuf struct
  * 24/06/2014	Mark Riddoch		Addition of gwbuf_trim
+ * 15/07/2014	Mark Riddoch		Addition of properties
  *
  * @endverbatim
  */
@@ -77,11 +78,14 @@ SHARED_BUF	*sbuf;
 		free(sbuf);
 		return NULL;
 	}
+	spinlock_init(&rval->lock);
 	rval->start = sbuf->data;
 	rval->end = rval->start + size;
 	sbuf->refcount = 1;
 	rval->sbuf = sbuf;
 	rval->next = NULL;
+	rval->hint = NULL;
+	rval->properties = NULL;
         rval->gwbuf_type = GWBUF_TYPE_UNDEFINED;
 	rval->command = 0;
         CHK_GWBUF(rval);
@@ -96,12 +100,29 @@ SHARED_BUF	*sbuf;
 void
 gwbuf_free(GWBUF *buf)
 {
+BUF_PROPERTY	*prop;
+
 	CHK_GWBUF(buf);
 	if (atomic_add(&buf->sbuf->refcount, -1) == 1)
 	{
                 free(buf->sbuf->data);
                 free(buf->sbuf);
 	}
+	while (buf->properties)
+	{
+		prop = buf->properties;
+		buf->properties = prop->next;
+		free(prop->name);
+		free(prop->value);
+		free(prop);
+	}
+        /** Release the hint */
+	while (buf->hint)
+        {
+                HINT* h = buf->hint;
+                buf->hint = buf->hint->next;
+                hint_free(h);
+        }
 	free(buf);
 }
 
@@ -130,6 +151,8 @@ GWBUF	*rval;
 	rval->start = buf->start;
 	rval->end = buf->end;
         rval->gwbuf_type = buf->gwbuf_type;
+	rval->properties = NULL;
+        rval->hint = NULL;
 	rval->next = NULL;
         CHK_GWBUF(rval);
 	return rval;
@@ -156,6 +179,8 @@ GWBUF *gwbuf_clone_portion(
         clonebuf->start = (void *)((char*)buf->start)+start_offset;
         clonebuf->end = (void *)((char *)clonebuf->start)+length;
         clonebuf->gwbuf_type = buf->gwbuf_type; /*< clone the type for now */ 
+	clonebuf->properties = NULL;
+        clonebuf->hint = NULL;
         clonebuf->next = NULL;
         CHK_GWBUF(clonebuf);
         return clonebuf;
@@ -339,4 +364,108 @@ void gwbuf_set_type(
 }
 
 
+/**
+ * Add a property to a buffer.
+ *
+ * @param buf	The buffer to add the property to
+ * @param name	The property name
+ * @param value	The property value
+ * @return	Non-zero on success
+ */
+int
+gwbuf_add_property(GWBUF *buf, char *name, char *value)
+{
+BUF_PROPERTY	*prop;
+
+	if ((prop = malloc(sizeof(BUF_PROPERTY))) == NULL)
+		return 0;
+
+	prop->name = strdup(name);
+	prop->value = strdup(value);
+	spinlock_acquire(&buf->lock);
+	prop->next = buf->properties;
+	buf->properties = prop;
+	spinlock_release(&buf->lock);
+	return 1;
+}
+
+/**
+ * Return the value of a buffer property
+ * @param buf	The buffer itself
+ * @param name	The name of the property to return
+ * @return The property value or NULL if the property was not found.
+ */
+char *
+gwbuf_get_property(GWBUF *buf, char *name)
+{
+BUF_PROPERTY	*prop;
+
+	spinlock_acquire(&buf->lock);
+	prop = buf->properties;
+	while (prop && strcmp(prop->name, name) != 0)
+		prop = prop->next;
+	spinlock_release(&buf->lock);
+	if (prop)
+		return prop->value;
+	return NULL;
+}
+
+
+/**
+ * Convert a chain of GWBUF structures into a single GWBUF structure
+ *
+ * @param orig		The chain to convert
+ * @return		The contiguous buffer
+ */
+GWBUF *
+gwbuf_make_contiguous(GWBUF *orig)
+{
+GWBUF	*newbuf;
+char	*ptr;
+int	len;
+
+	if (orig->next == NULL)
+		return orig;
+
+	if ((newbuf = gwbuf_alloc(gwbuf_length(orig))) != NULL)
+	{
+		ptr = GWBUF_DATA(newbuf);
+		while (orig)
+		{
+			len = GWBUF_LENGTH(orig);
+			memcpy(ptr, GWBUF_DATA(orig), len);
+			ptr += len;
+			orig = gwbuf_consume(orig, len);
+		}
+	}
+	return newbuf;
+}
+
+/**
+ * Add hint to a buffer.
+ *
+ * @param buf	The buffer to add the hint to
+ * @param hint	The hint itself
+ * @return	Non-zero on success
+ */
+int
+gwbuf_add_hint(GWBUF *buf, HINT *hint)
+{
+HINT	*ptr; 
+
+	spinlock_acquire(&buf->lock);
+	if (buf->hint)
+	{
+		ptr = buf->hint;
+		while (ptr->next)
+			ptr = ptr->next;
+		ptr->next = hint;
+	}
+	else
+	{
+		buf->hint = hint;
+	}
+	spinlock_release(&buf->lock);
+	return 1;
+}