doc: shuffled around some sections, fixes.

[staging/windowmanager.git] / src / util.cpp

diff --git a/src/util.cpp b/src/util.cpp
index 1d0601a..c178d90 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,65 +1,39 @@
-#include "util.hpp"
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-struct strftime_cache {
-   time_t time;
-   char buf[128];
-};
-
-static void log_(char const *log_type, FILE *stream, char const *fmt,
-                 va_list args) {
-   static struct strftime_cache strft;
+/*
+ * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * 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.
+ */
 
-   time_t t = time(NULL);
-   if (t != strft.time) {
-      strft.time = t;
-      struct tm tm;
-      struct tm *tmp = localtime_r(&t, &tm);
-      strftime(strft.buf, sizeof(strft.buf), "%Y-%m-%dT%H:%M:%S", tmp);
-   }
-
-   fputs(program_invocation_short_name, stream);
-   fputs("  ", stream);
-   fputs(strft.buf, stream);
-   fputs("  ", stream);
-   fputs(log_type, stream);
-   fputs("  ", stream);
-   vfprintf(stream, fmt, args);
-   fputs("\n", stream);
-}
+#include "util.hpp"
 
-void lognotice(char const *fmt, ...) {
-   va_list a;
-   va_start(a, fmt);
-   log_("notice", stdout, fmt, a);
-   va_end(a);
-}
+#include <cerrno>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
 
-void logerror(char const *fmt, ...) {
-   va_list a;
-   va_start(a, fmt);
-   log_("error", stderr, fmt, a);
-   va_end(a);
-}
+#include <unistd.h>
 
-void fatal(char const *fmt, ...) {
-   va_list a;
-   va_start(a, fmt);
-   log_("fatal", stderr, fmt, a);
-   va_end(a);
-   abort();
+#ifdef SCOPE_TRACING
+thread_local int ScopeTrace::indent = 0;
+ScopeTrace::ScopeTrace(char const *func) : f(func) {
+   fprintf(stderr, "%lu %*s%s -->\n", pthread_self(), 2 * indent++, "", this->f);
 }
+ScopeTrace::~ScopeTrace() { fprintf(stderr, "%lu %*s%s <--\n", pthread_self(), 2 * --indent, "", this->f); }
+#endif
 
-#ifdef DEBUG_OUTPUT
-void logdebug(char const *fmt, ...) {
-   va_list a;
-   va_start(a, fmt);
-   log_("debug", stdout, fmt, a);
-   va_end(a);
+unique_fd::~unique_fd() {
+   if (this->fd != -1) {
+      close(this->fd);
+   }
 }
-#endif