Merge lp:~sil2100/compiz-core/cherry_3236_3237 into lp:compiz-core

[Łukasz Zemczak]

Cherry-picked from compiz trunk (revs 3236, 3237):
Avoid constructing and destructing lots of strings on every single event, which was wasting lots of CPU (LP: #1005569)
Improve the fix for LP: #1005569:
Calling CompOption::setName should not implicitly construct a new string object every time, when the name is not changing.

This is also an alternative fix to the previous commit, but both together don't hurt either.

A cherry-pick of:
https://code.launchpad.net/~vanvugt/compiz/fix-1005569.1/+merge/107942 and
https://code.launchpad.net/~vanvugt/compiz/fix-1005569.2/+merge/107941

Original descriptions:

Calling CompOption::setName should not implicitly construct a new string
object every time, when the name is not changing. That wastes lots of CPU.
(LP: #1005569)

Avoid constructing and destructing lots of strings on every single event,
which was wasting lots of CPU (LP: #1005569)

[Daniel van Vugt (vanvugt)]

The ugly refactoring in src/event.cpp of mine is not required and only adds risk if you have the setName change already.

However, this fix is approved upstream, it's still smaller than many other changes being backported, and I'm running it right now and don't see any problems (other than bug 1014957).

review: Approve

=== modified file 'include/core/option.h'
--- include/core/option.h	2012-02-16 08:30:33 +0000
+++ include/core/option.h	2012-06-20 12:47:23 +0000
@@ -238,6 +238,7 @@
 	~CompOption ();
 
 	void setName (CompString name, Type type);
+	void setName (const char *name, Type type);
 
 	void reset ();
 

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-04-04 03:11:55 +0000
+++ src/event.cpp	2012-06-20 12:47:23 +0000
@@ -649,15 +649,19 @@
 bool
 PrivateScreen::handleActionEvent (XEvent *event)
 {
-    static CompOption::Vector o (8);
+    static CompOption::Vector o;
     Window xid;
 
-    o[0].setName ("event_window", CompOption::TypeInt);
-    o[1].setName ("window", CompOption::TypeInt);
-    o[2].setName ("modifiers", CompOption::TypeInt);
-    o[3].setName ("x", CompOption::TypeInt);
-    o[4].setName ("y", CompOption::TypeInt);
-    o[5].setName ("root", CompOption::TypeInt);
+    if (o.empty ())
+    {
+	o.resize (8);
+	o[0].setName ("event_window", CompOption::TypeInt);
+	o[1].setName ("window", CompOption::TypeInt);
+	o[2].setName ("modifiers", CompOption::TypeInt);
+	o[3].setName ("x", CompOption::TypeInt);
+	o[4].setName ("y", CompOption::TypeInt);
+	o[5].setName ("root", CompOption::TypeInt);
+    }
     o[6].reset ();
     o[7].reset ();
 
@@ -937,6 +941,14 @@
 	if (event->type == xkbEvent)
 	{
 	    XkbAnyEvent *xkbEvent = (XkbAnyEvent *) event;
+	    static CompOption::Vector o;
+
+	    if (o.empty ())
+	    {
+		o.resize (8);
+		o[0].setName ("event_window", CompOption::TypeInt);
+		o[1].setName ("window", CompOption::TypeInt);
+	    }
 
 	    if (xkbEvent->xkb_type == XkbStateNotify)
 	    {
@@ -944,13 +956,10 @@
 
 		o[0].value ().set ((int) activeWindow);
 		o[1].value ().set ((int) activeWindow);
+		o[2].setName ("modifiers", CompOption::TypeInt);
 		o[2].value ().set ((int) stateEvent->mods);
-
 		o[3].setName ("time", CompOption::TypeInt);
 		o[3].value ().set ((int) xkbEvent->time);
-		o[4].reset ();
-		o[5].reset ();
-		o[6].reset ();
 		o[7].value ().set ((int) xkbEvent->time);
 
 		if (stateEvent->event_type == KeyPress)
@@ -971,9 +980,6 @@
 		o[2].setName ("time", CompOption::TypeInt);
 		o[2].value ().set ((int) xkbEvent->time);
 		o[3].reset ();
-		o[4].reset ();
-		o[5].reset ();
-
 
 		foreach (CompPlugin *p, CompPlugin::getPlugins ())
 		{

=== modified file 'src/option.cpp'
--- src/option.cpp	2012-02-20 08:09:35 +0000
+++ src/option.cpp	2012-06-20 12:47:23 +0000
@@ -458,6 +458,14 @@
     priv->type = type;
 }
 
+void
+CompOption::setName (const char *name, CompOption::Type type)
+{
+    if (priv->name != name)
+	priv->name = name;
+    priv->type = type;
+}
+
 CompString
 CompOption::name ()
 {