Merge lp:~schuster/mysql-proxy/negative-clock into lp:mysql-proxy

[Michael Schuster]

[lp:~schuster/mysql-proxy/negative-clock]

974. By Michael Schuster on 2010-02-26

fix copyright (year)

[Jan Kneschke (jan-kneschke)]

review: Approve

[Jan Kneschke (jan-kneschke)]

rebased, fixed the conflicts against the current trunk and pushed over

=== modified file 'plugins/proxy/proxy-plugin.c'
--- plugins/proxy/proxy-plugin.c	2010-02-08 11:23:10 +0000
+++ plugins/proxy/proxy-plugin.c	2010-02-26 08:20:31 +0000
@@ -1,5 +1,5 @@
 /* $%BEGINLICENSE%$
- Copyright (C) 2007-2008 MySQL AB, 2008 Sun Microsystems, Inc
+ Copyright (C) 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -145,6 +145,7 @@
 #include "lua-load-factory.h"
 
 #include "chassis-timings.h"
+#include "chassis-gtimeval.h"
 
 #define C(x) x, sizeof(x) - 1
 #define S(x) x->str, x->len
@@ -1469,7 +1470,7 @@
 
 			/* mark the backend as being DOWN and retry with a different one */
 			st->backend->state = BACKEND_STATE_DOWN;
-			g_get_current_time(&(st->backend->state_since));
+			(void) chassis_gtime_testset_now(&st->backend->state_since);
 			network_socket_free(con->server);
 			con->server = NULL;
 
@@ -1481,7 +1482,7 @@
 
 		if (st->backend->state != BACKEND_STATE_UP) {
 			st->backend->state = BACKEND_STATE_UP;
-			g_get_current_time(&(st->backend->state_since));
+			(void) chassis_gtime_testset_now(&st->backend->state_since);
 		}
 
 		con->state = CON_STATE_READ_HANDSHAKE;
@@ -1599,7 +1600,7 @@
 					__FILE__, __LINE__, con->server->dst->name->str);
 
 			st->backend->state = BACKEND_STATE_DOWN;
-			g_get_current_time(&(st->backend->state_since));
+			(void) chassis_gtime_testset_now(&st->backend->state_since);
 
 			network_socket_free(con->server);
 			con->server = NULL;
@@ -1609,7 +1610,7 @@
 
 		if (st->backend->state != BACKEND_STATE_UP) {
 			st->backend->state = BACKEND_STATE_UP;
-			g_get_current_time(&(st->backend->state_since));
+			(void) chassis_gtime_testset_now(&st->backend->state_since);
 		}
 
 		con->state = CON_STATE_READ_HANDSHAKE;

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2010-02-25 12:39:54 +0000
+++ src/CMakeLists.txt	2010-02-26 08:20:32 +0000
@@ -1,3 +1,20 @@
+# $%BEGINLICENSE%$
+# Copyright (C) 2009-2010 Sun Microsystems, Inc
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# $%ENDLICENSE%$
 INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) # for config.h
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -17,12 +34,10 @@
 ADD_DEFINITIONS(-DSHARED_LIBRARY_SUFFIX="${SHARED_LIBRARY_SUFFIX}")
 
 SET(chassis_sources 
-	glib-ext.c
-	glib-ext-ref.c
 	lua-load-factory.c
 	lua-scope.c
 	chassis-plugin.c
-  chassis-event-thread.c
+	chassis-event-thread.c
 	chassis-log.c
 	chassis-mainloop.c
 	chassis-shutdown-hooks.c
@@ -31,13 +46,25 @@
 	chassis-filemode.c
 	chassis-limits.c
 	chassis-stats.c
+<<<<<<< TREE
 )
 
 SET(chassis_timing_sources
+=======
+)
+
+SET(timing_sources
+>>>>>>> MERGE-SOURCE
 	chassis-timings.c
+	chassis-gtimeval.c
 	my_rdtsc.c
 )
 
+SET(glibext_sources
+	glib-ext.c
+	glib-ext-ref.c
+)
+
 SET(proxy_sources 
 	network-mysqld.c 
 	network-mysqld-lua.c 
@@ -62,6 +89,8 @@
 ADD_LIBRARY(mysql-chassis SHARED ${chassis_sources})
 ADD_LIBRARY(mysql-chassis-timing SHARED ${chassis_timing_sources})
 ADD_LIBRARY(mysql-chassis-proxy SHARED ${proxy_sources})
+ADD_LIBRARY(mysql-chassis-glibext SHARED ${glibext_sources})
+ADD_LIBRARY(mysql-chassis-timing SHARED ${timing_sources})
 ADD_EXECUTABLE(mysql-proxy chassis.c)
 
 ## for windows we need the winsock lib
@@ -84,11 +113,17 @@
 	${LUA_LIBRARIES}
 	${EVENT_LIBRARIES}
 	${WINSOCK_LIBRARIES}
+<<<<<<< TREE
 	mysql-chassis-timing
+=======
+	mysql-chassis-glibext
+>>>>>>> MERGE-SOURCE
 )
 
 TARGET_LINK_LIBRARIES(mysql-chassis-proxy
-	mysql-chassis
+	mysql-chassis 
+	mysql-chassis-glibext
+	mysql-chassis-timing
 )
 
 TARGET_LINK_LIBRARIES(mysql-proxy 
@@ -99,6 +134,8 @@
 	${EVENT_LIBRARIES}
 	mysql-chassis
 	mysql-chassis-proxy
+	mysql-chassis-glibext
+	mysql-chassis-timing
 )
 
 IF(WIN32)
@@ -111,6 +148,8 @@
 		${EVENT_LIBRARIES}
 		mysql-chassis
 		mysql-chassis-proxy
+		mysql-chassis-glibext
+		mysql-chassis-timing
 	)
 	SET_TARGET_PROPERTIES(mysql-proxy-svc
 		PROPERTIES
@@ -158,7 +197,12 @@
 
 CHASSIS_INSTALL_TARGET(mysql-chassis)
 CHASSIS_INSTALL_TARGET(mysql-chassis-proxy)
-CHASSIS_INSTALL_TARGET(mysql-chassis-timing)
+<<<<<<< TREE
+CHASSIS_INSTALL_TARGET(mysql-chassis-timing)
+=======
+CHASSIS_INSTALL_TARGET(mysql-chassis-glibext)
+CHASSIS_INSTALL_TARGET(mysql-chassis-timing)
+>>>>>>> MERGE-SOURCE
 
 INSTALL(FILES
 	network-mysqld.h
@@ -200,6 +244,7 @@
 	lua-registry-keys.h
 	chassis-stats.h
 	chassis-timings.h
+	chassis-gtimeval.h
 	my_rdtsc.h
 	DESTINATION include/
 	)

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-02-19 15:23:10 +0000
+++ src/Makefile.am	2010-02-26 08:20:32 +0000
@@ -1,3 +1,20 @@
+# $%BEGINLICENSE%$
+# Copyright (C) 2009-2010 Sun Microsystems, Inc
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# $%ENDLICENSE%$
 luaextdir = ${pkglibdir}/lua
 plugindir = ${pkglibdir}/plugins
 
@@ -32,13 +49,26 @@
 
 lib_LTLIBRARIES = 
 
+# functionality extending what's currently in glib
+lib_LTLIBRARIES += libmysql-chassis-glibext.la
+libmysql_chassis_glibext_la_SOURCES = \
+	glib-ext.c \
+	glib-ext-ref.c
+
+libmysql_chassis_glibext_la_LDFLAGS  = -export-dynamic -no-undefined -dynamic
+libmysql_chassis_glibext_la_CPPFLAGS = $(MYSQL_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
+libmysql_chassis_glibext_la_LIBADD   = $(GLIB_LIBS)
+
+# library implementing timing functionality
 lib_LTLIBRARIES += libmysql-chassis-timing.la
 libmysql_chassis_timing_la_SOURCES = \
 	chassis-timings.c \
+	chassis-gtimeval.c \
 	my_rdtsc.c
+
 libmysql_chassis_timing_la_LDFLAGS  = -export-dynamic -no-undefined -dynamic
 libmysql_chassis_timing_la_CPPFLAGS = $(MYSQL_CFLAGS) $(GLIB_CFLAGS) $(LUA_CFLAGS) $(GMODULE_CFLAGS)
-libmysql_chassis_timing_la_LIBADD   = $(GLIB_LIBS)
+libmysql_chassis_timing_la_LIBADD   = $(GLIB_LIBS) libmysql-chassis-glibext.la
 if USE_SUNCC_ASSEMBLY
 libmysql_chassis_timing_la_CPPFLAGS += \
 	$(top_srcdir)/src/my_timer_cycles.il
@@ -48,8 +78,6 @@
 ## the core library
 lib_LTLIBRARIES += libmysql-chassis.la
 libmysql_chassis_la_SOURCES = \
-	glib-ext.c \
-	glib-ext-ref.c \
 	lua-load-factory.c \
 	lua-scope.c \
 	chassis-plugin.c \
@@ -66,7 +94,7 @@
 
 libmysql_chassis_la_LDFLAGS  = -export-dynamic -no-undefined -dynamic
 libmysql_chassis_la_CPPFLAGS = $(MYSQL_CFLAGS) $(EVENT_CFLAGS) $(GLIB_CFLAGS) $(LUA_CFLAGS) $(GMODULE_CFLAGS) $(GTHREAD_CFLAGS)
-libmysql_chassis_la_LIBADD   = $(EVENT_LIBS)   $(GLIB_LIBS)   $(LUA_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS) libmysql-chassis-timing.la
+libmysql_chassis_la_LIBADD   = $(EVENT_LIBS)   $(GLIB_LIBS)   $(LUA_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS) libmysql-chassis-timing.la libmysql-chassis-glibext.la
 
 lib_LTLIBRARIES += libmysql-proxy.la
 libmysql_proxy_la_SOURCES = \
@@ -91,7 +119,7 @@
 
 libmysql_proxy_la_LDFLAGS  = -export-dynamic -no-undefined -dynamic
 libmysql_proxy_la_CPPFLAGS = $(MYSQL_CFLAGS) $(GLIB_CFLAGS) $(LUA_CFLAGS) $(GMODULE_CFLAGS)
-libmysql_proxy_la_LIBADD   = $(EVENT_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) libmysql-chassis.la libmysql-chassis-timing.la
+libmysql_proxy_la_LIBADD   = $(EVENT_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) libmysql-chassis.la libmysql-chassis-timing.la libmysql-chassis-glibext.la
 
 
 include_HEADERS=\

=== added file 'src/chassis-gtimeval.c'
--- src/chassis-gtimeval.c	1970-01-01 00:00:00 +0000
+++ src/chassis-gtimeval.c	2010-02-26 08:20:32 +0000
@@ -0,0 +1,43 @@
+/* $%BEGINLICENSE%$
+ Copyright (C) 2010 Sun Microsystems, Inc
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ $%ENDLICENSE%$ */
+
+#include <glib.h>
+
+#include "chassis-gtimeval.h"
+
+gint64 chassis_gtime_testset_now(GTimeVal *gt)
+{
+	GTimeVal	now;
+	gint64		tdiff;
+
+	if (gt == NULL)
+		return (0);
+
+	g_get_current_time(&now);
+	tdiff = ge_gtimeval_diff(gt, &now);
+
+	if (tdiff < 0) {
+		g_critical("%s: time went backwards (%"G_GINT64_FORMAT" usec)!",
+				G_STRLOC, tdiff);
+		gt->tv_usec = gt->tv_sec = 0;
+		return tdiff;
+	}
+
+	*gt = now;
+	return tdiff;
+}

=== added file 'src/chassis-gtimeval.h'
--- src/chassis-gtimeval.h	1970-01-01 00:00:00 +0000
+++ src/chassis-gtimeval.h	2010-02-26 08:20:32 +0000
@@ -0,0 +1,34 @@
+/* $%BEGINLICENSE%$
+ Copyright (C) 2010 Sun Microsystems, Inc
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ $%ENDLICENSE%$ */
+
+#ifndef __CHASSIS_GTIMEVAL_H__
+#define __CHASSIS_GTIMEVAL_H__
+
+#include <glib.h>
+#include "glib-ext.h"
+
+/**
+ * stores the current time in the location passed as argument
+ * if time is seen to move backwards, output an error message and
+ * set the time to "0".
+ * @param pointer to a GTimeVal struct
+ * @return difference in usec between provided timestamp and "now"
+ */
+
+CHASSIS_API gint64 chassis_gtime_testset_now(GTimeVal *gt);
+#endif

=== modified file 'src/chassis-timings.c'
--- src/chassis-timings.c	2010-01-20 08:59:12 +0000
+++ src/chassis-timings.c	2010-02-26 08:20:32 +0000
@@ -1,5 +1,5 @@
 /* $%BEGINLICENSE%$
- Copyright (C) 2009 Sun Microsystems, Inc
+ Copyright (C) 2009-2010 Sun Microsystems, Inc
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 #include <glib.h>
 
 #include "chassis-timings.h"
+#include "glib-ext.h"
 
 #define MICROS_IN_SEC 1000000
 

=== modified file 'src/glib-ext.c'
--- src/glib-ext.c	2009-11-11 16:58:44 +0000
+++ src/glib-ext.c	2010-02-26 08:20:32 +0000
@@ -1,5 +1,5 @@
 /* $%BEGINLICENSE%$
- Copyright (C) 2007-2008 MySQL AB, 2008 Sun Microsystems, Inc
+ Copyright (C) 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -142,6 +142,20 @@
 	return g_string_get_time(s, &gt);
 }
 
+/**
+ * calculate the difference between two GTimeVal values, in usec
+ * positive return means *told is indeed "earlier" than *tnew, negative
+ * return means the reverse
+ * Caller is responsible for passing valid pointers
+ */
+gint64 ge_gtimeval_diff(GTimeVal *told, GTimeVal *tnew) {
+	gint64	diff;
+
+	diff = (gint64) tnew->tv_sec - told->tv_sec;
+	diff *= G_USEC_PER_SEC;
+	diff += (gint64) tnew->tv_usec - told->tv_usec;
+	return diff;
+}
 
 GString * g_string_assign_len(GString *s, const char *str, gsize str_len) {
 	g_string_truncate(s, 0);

=== modified file 'src/glib-ext.h'
--- src/glib-ext.h	2009-11-11 16:58:44 +0000
+++ src/glib-ext.h	2010-02-26 08:20:32 +0000
@@ -1,5 +1,5 @@
 /* $%BEGINLICENSE%$
- Copyright (C) 2007-2008 MySQL AB, 2008 Sun Microsystems, Inc
+ Copyright (C) 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -41,6 +41,7 @@
 
 CHASSIS_API int g_string_get_time(GString *s, GTimeVal *gt);
 CHASSIS_API int g_string_get_current_time(GString *s);
+CHASSIS_API gint64 ge_gtimeval_diff(GTimeVal *old, GTimeVal *new);
 CHASSIS_API GString *g_string_assign_len(GString *s, const char *, gsize );
 CHASSIS_API void g_debug_hexdump(const char *msg, const void *s, size_t len);
 

=== modified file 'src/network-backend.c'
--- src/network-backend.c	2009-09-16 12:20:47 +0000
+++ src/network-backend.c	2010-02-26 08:20:32 +0000
@@ -1,5 +1,5 @@
 /* $%BEGINLICENSE%$
- Copyright (C) 2008 MySQL AB, 2008 Sun Microsystems, Inc
+ Copyright (C) 2008 MySQL AB, 2008-2010 Sun Microsystems, Inc
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -143,14 +143,23 @@
 	GTimeVal now;
 	guint i;
 	int backends_woken_up = 0;
+	gint64	t_diff;
 
 	g_get_current_time(&now);
+	t_diff = ge_gtimeval_diff(&bs->backend_last_check, &now);
 
 	/* check max(once a second) */
-	if (bs->backend_last_check.tv_sec > 0 &&
-	    now.tv_sec - bs->backend_last_check.tv_sec < 1) return 0;
-
-
+	/* this also covers the "time went backards" case */
+	if (t_diff < G_USEC_PER_SEC) {
+		if (t_diff < 0) {
+			g_critical("%s: time went backwards (%"G_GINT64_FORMAT" usec)!",
+				G_STRLOC, t_diff);
+			bs->backend_last_check.tv_usec = 0;
+			bs->backend_last_check.tv_sec = 0;
+		}
+		return 0;
+	}
+	
 	/* check once a second if we have to wakeup a connection */
 	g_mutex_lock(bs->backends_mutex);
 

=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am	2010-02-22 15:23:06 +0000
+++ tests/unit/Makefile.am	2010-02-26 08:20:32 +0000
@@ -1,3 +1,21 @@
+# $%BEGINLICENSE%$
+# Copyright (C) 2009-2010 Sun Microsystems, Inc
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# $%ENDLICENSE%$ 
+
 SUBDIRS=lua
 
 TESTS=\
@@ -76,6 +94,7 @@
 t_chassis_timings_SOURCES  = \
 	t_chassis_timings.c \
 	$(top_srcdir)/src/chassis-timings.c \
+	$(top_srcdir)/src/glib-ext.c \
 	$(top_srcdir)/src/my_rdtsc.c 
 
 t_chassis_timings_CPPFLAGS = -I$(top_srcdir)/src/ $(GLIB_CFLAGS) 
@@ -151,6 +170,7 @@
 
 t_network_backend_SOURCES  = \
 	t_network_backend.c \
+	$(top_srcdir)/src/chassis-timings.c \
 	$(top_srcdir)/src/glib-ext.c \
 	$(top_srcdir)/src/network-backend.c \
 	$(top_srcdir)/src/network-mysqld-proto.c \
@@ -158,7 +178,8 @@
 	$(top_srcdir)/src/network-conn-pool.c \
 	$(top_srcdir)/src/network-address.c \
 	$(top_srcdir)/src/network-queue.c \
-	$(top_srcdir)/src/network-socket.c
+	$(top_srcdir)/src/network-socket.c \
+	$(top_srcdir)/src/my_rdtsc.c
 
 t_network_backend_CPPFLAGS = -I$(top_srcdir)/src/ $(GLIB_CFLAGS) $(MYSQL_CFLAGS) $(GMODULE_CFLAGS) $(EVENT_CFLAGS) $(LUA_CFLAGS)
 t_network_backend_LDADD    = $(GLIB_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS) $(EVENT_LIBS) $(LUA_LIBS)