Merge remote branch 'upstream/master'

Conflicts:
	etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
	etherpad/src/etherpad/control/pro/pro_main_control.js
	etherpad/src/etherpad/control/pro_help_control.js
	etherpad/src/etherpad/globals.js
	etherpad/src/etherpad/legacy_urls.js
	etherpad/src/etherpad/pne/pne_utils.js
	etherpad/src/etherpad/pro/pro_utils.js
	etherpad/src/main.js
	etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
	etherpad/src/plugins/testplugin/templates/page.ejs
	etherpad/src/static/css/pad2_ejs.css
	etherpad/src/static/css/pro-help.css
	etherpad/src/static/img/jun09/pad/protop.gif
	etherpad/src/static/js/store.js
	etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
	etherpad/src/themes/default/templates/main/home.ejs
	etherpad/src/themes/default/templates/pro-help/main.ejs
	etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
	infrastructure/com.etherpad/licensing.scala
	trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
	trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
	trunk/etherpad/src/static/css/home-opensource.css
	trunk/etherpad/src/static/js/ace.js
	trunk/etherpad/src/static/js/linestylefilter_client.js
	trunk/etherpad/src/templates/email/eepnet_license_info.ejs
	trunk/etherpad/src/templates/pad/pad_body2.ejs
	trunk/etherpad/src/templates/pad/pad_content.ejs
	trunk/etherpad/src/templates/pad/padfull_body.ejs
	trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs

1 files changed, 85 insertions, 0 deletions

diff --git a/infrastructure/net.appjet.ajstdlib/timer.scala b/infrastructure/net.appjet.ajstdlib/timer.scala
new file mode 100644
index 0000000..dac8fb6
--- /dev/null
+++ b/infrastructure/net.appjet.ajstdlib/timer.scala
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2009 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.appjet.ajstdlib;
+
+import scala.collection.mutable.{HashMap,ListBuffer};
+import java.util.concurrent.locks.ReentrantLock;
+
+object timer {
+
+  var _timings = new HashMap[String,ListBuffer[double]];
+  var _lock = new ReentrantLock;
+  var _callstack = new ThreadLocal[ListBuffer[String]];
+
+  def start(opname: String) = {
+    var _localcallstack = _callstack.get();
+    if (_localcallstack == null) {
+      _callstack.set(new ListBuffer[String]);
+      _localcallstack = _callstack.get();
+    }
+    _localcallstack += opname;
+    var _oplabel = _localcallstack.mkString(".");
+    val startTime: long = System.nanoTime();
+
+    new {
+      def done() {
+	val elapsedTimeMs: double = (System.nanoTime() - startTime) / 1.0e6;
+
+	_lock.lock();
+	try {
+  	  var times = _timings.getOrElse(_oplabel, new ListBuffer[double]);
+	  /*
+	  if (times.size > 100000) {
+	    times = new ListBuffer[double];
+	  }*/
+	  times += elapsedTimeMs;
+	  _timings.put(_oplabel, times);
+	  _localcallstack.remove(_localcallstack.length-1);
+	} finally {
+  	  _lock.unlock();
+	}
+      }
+    }
+  }
+
+  def getOpNames(): Array[String] = {
+    _lock.lock();
+    try {
+      return _timings.keys.toList.toArray;
+    } finally {
+      _lock.unlock();
+    }
+  }
+
+  def getStats(opname: String): Array[double] = {
+    _lock.lock();
+
+    try {
+      var times:ListBuffer[double] = _timings(opname);
+      var total = times.foldRight(0.0)(_ + _);
+      return Array(times.size, total, (total / times.size));
+    } finally {  
+      _lock.unlock();
+    }
+  }
+
+  def reset() {
+    _lock.lock();
+    _timings = new HashMap[String,ListBuffer[double]];
+    _lock.unlock();
+  }
+}