Cycles: remove prefix from source code file names

Remove prefix of filenames that is the same as the folder name. This used
to help when #includes were using individual files, but now they are always
relative to the cycles root directory and so the prefixes are redundant.

For patches and branches, git merge and rebase should be able to detect the
renames and move over code to the right file.

1 files changed, 91 insertions, 0 deletions

diff --git a/intern/cycles/util/time.h b/intern/cycles/util/time.h
new file mode 100644
index 00000000000..380921664e8
--- /dev/null
+++ b/intern/cycles/util/time.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2011-2013 Blender Foundation
+ *
+ * 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.
+ */
+
+#ifndef __UTIL_TIME_H__
+#define __UTIL_TIME_H__
+
+#include "util/function.h"
+#include "util/string.h"
+
+CCL_NAMESPACE_BEGIN
+
+/* Give current time in seconds in double precision, with good accuracy. */
+
+double time_dt();
+
+/* Sleep for the specified number of seconds. */
+
+void time_sleep(double t);
+
+/* Scoped timer. */
+
+class scoped_timer {
+ public:
+  explicit scoped_timer(double *value = NULL) : value_(value)
+  {
+    time_start_ = time_dt();
+  }
+
+  ~scoped_timer()
+  {
+    if (value_ != NULL) {
+      *value_ = get_time();
+    }
+  }
+
+  double get_start() const
+  {
+    return time_start_;
+  }
+
+  double get_time() const
+  {
+    return time_dt() - time_start_;
+  }
+
+ protected:
+  double *value_;
+  double time_start_;
+};
+
+class scoped_callback_timer {
+ public:
+  using callback_type = function<void(double)>;
+
+  explicit scoped_callback_timer(callback_type cb) : cb(cb)
+  {
+  }
+
+  ~scoped_callback_timer()
+  {
+    if (cb) {
+      cb(timer.get_time());
+    }
+  }
+
+ protected:
+  scoped_timer timer;
+  callback_type cb;
+};
+
+/* Make human readable string from time, compatible with Blender metadata. */
+
+string time_human_readable_from_seconds(const double seconds);
+double time_human_readable_to_seconds(const string &str);
+
+CCL_NAMESPACE_END
+
+#endif