Revision: 78229
http://sourceforge.net/p/brlcad/code/78229
Author: starseeker
Date: 2021-02-10 12:57:41 +0000 (Wed, 10 Feb 2021)
Log Message:
-----------
C->C++
Modified Paths:
--------------
brlcad/trunk/src/libbu/CMakeLists.txt
brlcad/trunk/src/libbu/y2038/time64.h
Added Paths:
-----------
brlcad/trunk/src/libbu/datetime.cpp
Removed Paths:
-------------
brlcad/trunk/src/libbu/datetime.c
Modified: brlcad/trunk/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/CMakeLists.txt 2021-02-09 19:17:55 UTC (rev
78228)
+++ brlcad/trunk/src/libbu/CMakeLists.txt 2021-02-10 12:57:41 UTC (rev
78229)
@@ -64,7 +64,7 @@
dir.c
dirent.c
damlevlim.cpp
- datetime.c
+ datetime.cpp
dylib.c
encode.c
endian.c
Deleted: brlcad/trunk/src/libbu/datetime.c
===================================================================
--- brlcad/trunk/src/libbu/datetime.c 2021-02-09 19:17:55 UTC (rev 78228)
+++ brlcad/trunk/src/libbu/datetime.c 2021-02-10 12:57:41 UTC (rev 78229)
@@ -1,147 +0,0 @@
-/* D A T E T I M E . C
- * BRL-CAD
- *
- * Copyright (c) 2013-2021 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-
-#include "common.h"
-
-#include <time.h>
-#include <string.h>
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SCHED_H
-# include <sched.h>
-#endif
-
-#include "bio.h"
-
-#include "bu/log.h"
-#include "bu/time.h"
-#include "bu/parallel.h"
-#include "bu/vls.h"
-
-#include "y2038/time64.h"
-
-/* for strict c90 */
-#ifndef HAVE_DECL_GETTIMEOFDAY
-extern int gettimeofday(struct timeval *, void *);
-#endif
-
-int BU_SEM_DATETIME;
-
-
-void
-bu_utctime(struct bu_vls *vls_gmtime, const int64_t time_val)
-{
- static const char *nulltime = "0000-00-00T00:00:00Z";
- struct tm loctime;
- struct tm* retval;
- Time64_T some_time;
- int fail = 0;
-
- if (!vls_gmtime)
- return;
-
- BU_CK_VLS(vls_gmtime);
-
- some_time = (Time64_T)time_val;
- if (some_time == (Time64_T)(-1)) {
- /* time error: but set something, an invalid "NULL" time. */
- bu_vls_sprintf(vls_gmtime, "%s", nulltime);
- return;
- }
-
- memset(&loctime, 0, sizeof(loctime));
-
- bu_semaphore_acquire(BU_SEM_DATETIME);
- retval = gmtime64(&some_time);
- if (retval)
- loctime = *retval; /* struct copy */
- else
- fail = 1;
- bu_semaphore_release(BU_SEM_DATETIME);
-
- if (fail) {
- /* time error: but set something, an invalid "NULL" time. */
- bu_vls_sprintf(vls_gmtime, "%s", nulltime);
- return;
- }
-
- /* put the UTC time in the desired ISO format: "yyyy-mm-ddThh:mm:ssZ" */
- bu_vls_sprintf(vls_gmtime, "%04d-%02d-%02dT%02d:%02d:%02dZ",
- loctime.tm_year + 1900,
- loctime.tm_mon + 1,
- loctime.tm_mday,
- loctime.tm_hour,
- loctime.tm_min,
- loctime.tm_sec);
-}
-
-
-
-/* FIXME: Need to document whether this function should
- * be returning wallclock or cpu time.
- */
-int64_t
-bu_gettime(void)
-{
-#ifdef HAVE_SYS_TIME_H
-
- struct timeval nowTime;
-
- gettimeofday(&nowTime, NULL);
- return ((int64_t)nowTime.tv_sec * (int64_t)1000000
- + (int64_t)nowTime.tv_usec);
-
-#else /* HAVE_SYS_TIME_H */
-# ifdef HAVE_WINDOWS_H
-
- FILETIME ft;
- ULARGE_INTEGER ut;
- long long nowTime;
- GetSystemTimePreciseAsFileTime(&ft);
- ut.LowPart = ft.dwLowDateTime;
- ut.HighPart = ft.dwHighDateTime;
- /*
https://support.microsoft.com/en-us/help/167296/how-to-convert-a-unix-time-t-to-a-win32-filetime-or-systemtime
*/
- nowTime = (ut.QuadPart - 116444736000000000)/10;
- return nowTime;
-
-# else /* HAVE_WINDOWS_H */
-# warning "bu_gettime() implementation missing for this machine type"
- bu_log("WARNING, no bu_gettime implementation for this machine type.\n");
- return -1;
-
-# endif /* HAVE_WINDOWS_H */
-#endif /* HAVE_SYS_TIME_H */
-}
-
-
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */
Copied: brlcad/trunk/src/libbu/datetime.cpp (from rev 78228,
brlcad/trunk/src/libbu/datetime.c)
===================================================================
--- brlcad/trunk/src/libbu/datetime.cpp (rev 0)
+++ brlcad/trunk/src/libbu/datetime.cpp 2021-02-10 12:57:41 UTC (rev 78229)
@@ -0,0 +1,147 @@
+/* D A T E T I M E . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2013-2021 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+
+#include "common.h"
+
+#include <time.h>
+#include <string.h>
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SCHED_H
+# include <sched.h>
+#endif
+
+#include "bio.h"
+
+#include "bu/log.h"
+#include "bu/time.h"
+#include "bu/parallel.h"
+#include "bu/vls.h"
+
+#include "y2038/time64.h"
+
+/* for strict c90 */
+#ifndef HAVE_DECL_GETTIMEOFDAY
+extern int gettimeofday(struct timeval *, void *);
+#endif
+
+int BU_SEM_DATETIME;
+
+
+void
+bu_utctime(struct bu_vls *vls_gmtime, const int64_t time_val)
+{
+ static const char *nulltime = "0000-00-00T00:00:00Z";
+ struct tm loctime;
+ struct tm* retval;
+ Time64_T some_time;
+ int fail = 0;
+
+ if (!vls_gmtime)
+ return;
+
+ BU_CK_VLS(vls_gmtime);
+
+ some_time = (Time64_T)time_val;
+ if (some_time == (Time64_T)(-1)) {
+ /* time error: but set something, an invalid "NULL" time. */
+ bu_vls_sprintf(vls_gmtime, "%s", nulltime);
+ return;
+ }
+
+ memset(&loctime, 0, sizeof(loctime));
+
+ bu_semaphore_acquire(BU_SEM_DATETIME);
+ retval = gmtime64(&some_time);
+ if (retval)
+ loctime = *retval; /* struct copy */
+ else
+ fail = 1;
+ bu_semaphore_release(BU_SEM_DATETIME);
+
+ if (fail) {
+ /* time error: but set something, an invalid "NULL" time. */
+ bu_vls_sprintf(vls_gmtime, "%s", nulltime);
+ return;
+ }
+
+ /* put the UTC time in the desired ISO format: "yyyy-mm-ddThh:mm:ssZ" */
+ bu_vls_sprintf(vls_gmtime, "%04d-%02d-%02dT%02d:%02d:%02dZ",
+ loctime.tm_year + 1900,
+ loctime.tm_mon + 1,
+ loctime.tm_mday,
+ loctime.tm_hour,
+ loctime.tm_min,
+ loctime.tm_sec);
+}
+
+
+
+/* FIXME: Need to document whether this function should
+ * be returning wallclock or cpu time.
+ */
+int64_t
+bu_gettime(void)
+{
+#ifdef HAVE_SYS_TIME_H
+
+ struct timeval nowTime;
+
+ gettimeofday(&nowTime, NULL);
+ return ((int64_t)nowTime.tv_sec * (int64_t)1000000
+ + (int64_t)nowTime.tv_usec);
+
+#else /* HAVE_SYS_TIME_H */
+# ifdef HAVE_WINDOWS_H
+
+ FILETIME ft;
+ ULARGE_INTEGER ut;
+ long long nowTime;
+ GetSystemTimePreciseAsFileTime(&ft);
+ ut.LowPart = ft.dwLowDateTime;
+ ut.HighPart = ft.dwHighDateTime;
+ /*
https://support.microsoft.com/en-us/help/167296/how-to-convert-a-unix-time-t-to-a-win32-filetime-or-systemtime
*/
+ nowTime = (ut.QuadPart - 116444736000000000)/10;
+ return nowTime;
+
+# else /* HAVE_WINDOWS_H */
+# warning "bu_gettime() implementation missing for this machine type"
+ bu_log("WARNING, no bu_gettime implementation for this machine type.\n");
+ return -1;
+
+# endif /* HAVE_WINDOWS_H */
+#endif /* HAVE_SYS_TIME_H */
+}
+
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Modified: brlcad/trunk/src/libbu/y2038/time64.h
===================================================================
--- brlcad/trunk/src/libbu/y2038/time64.h 2021-02-09 19:17:55 UTC (rev
78228)
+++ brlcad/trunk/src/libbu/y2038/time64.h 2021-02-10 12:57:41 UTC (rev
78229)
@@ -127,7 +127,7 @@
#endif
#ifdef __cplusplus
- };
+ }
#endif
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
