* [PATCH babeltrace 2/4] Cleanup: bt namespace for compat timegm
[not found] <1473899550-30486-1-git-send-email-mjeanson@efficios.com>
@ 2016-09-15 0:32 ` Michael Jeanson
2016-09-15 0:32 ` [PATCH babeltrace 3/4] Cleanup: bt namespace for compat glib Michael Jeanson
` (2 subsequent siblings)
3 siblings, 0 replies; 4+ messages in thread
From: Michael Jeanson @ 2016-09-15 0:32 UTC (permalink / raw)
To: lttng-dev; +Cc: jgalar
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
converter/babeltrace-log.c | 2 +-
include/babeltrace/compat/utc.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index db7f60f..8cb35d1 100644
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -230,7 +230,7 @@ void write_event_header(struct ctf_stream_pos *pos, char *line,
ti.tm_min = min;
ti.tm_sec = sec;
- ep_sec = babeltrace_timegm(&ti);
+ ep_sec = bt_timegm(&ti);
if (ep_sec != (time_t) -1) {
*ts = (uint64_t) ep_sec * NSEC_PER_SEC
+ (uint64_t) msec * NSEC_PER_MSEC;
diff --git a/include/babeltrace/compat/utc.h b/include/babeltrace/compat/utc.h
index d59d856..fd41f62 100644
--- a/include/babeltrace/compat/utc.h
+++ b/include/babeltrace/compat/utc.h
@@ -29,7 +29,7 @@
#if defined(_BSD_SOURCE) || defined(_SVID_SOURCE)
static inline
-time_t babeltrace_timegm(struct tm *tm)
+time_t bt_timegm(struct tm *tm)
{
return timegm(tm);
}
@@ -47,7 +47,7 @@ time_t babeltrace_timegm(struct tm *tm)
*/
static inline
-time_t babeltrace_timegm(struct tm *tm)
+time_t bt_timegm(struct tm *tm)
{
time_t ret;
char *tz;
--
2.7.4
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH babeltrace 3/4] Cleanup: bt namespace for compat glib
[not found] <1473899550-30486-1-git-send-email-mjeanson@efficios.com>
2016-09-15 0:32 ` [PATCH babeltrace 2/4] Cleanup: bt namespace for compat timegm Michael Jeanson
@ 2016-09-15 0:32 ` Michael Jeanson
2016-09-15 0:32 ` [PATCH babeltrace 4/4] Cleanup: bt namespace for compat memstream.h Michael Jeanson
2017-05-26 13:49 ` [PATCH babeltrace 1/4] Cleanup: bt namespace for compat strerror_r Jérémie Galarneau
3 siblings, 0 replies; 4+ messages in thread
From: Michael Jeanson @ 2016-09-15 0:32 UTC (permalink / raw)
To: lttng-dev; +Cc: jgalar
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
include/babeltrace/compat/glib.h | 8 ++++----
lib/values.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/babeltrace/compat/glib.h b/include/babeltrace/compat/glib.h
index a95d045..dd03b19 100644
--- a/include/babeltrace/compat/glib.h
+++ b/include/babeltrace/compat/glib.h
@@ -30,7 +30,7 @@
#if GLIB_CHECK_VERSION(2,31,8)
static inline gboolean
-babeltrace_g_hash_table_contains(GHashTable *hash_table, gconstpointer key)
+bt_g_hash_table_contains(GHashTable *hash_table, gconstpointer key)
{
return g_hash_table_contains(hash_table, key);
}
@@ -38,7 +38,7 @@ babeltrace_g_hash_table_contains(GHashTable *hash_table, gconstpointer key)
#else
static inline gboolean
-babeltrace_g_hash_table_contains(GHashTable *hash_table, gconstpointer key)
+bt_g_hash_table_contains(GHashTable *hash_table, gconstpointer key)
{
const char *value;
@@ -56,7 +56,7 @@ babeltrace_g_hash_table_contains(GHashTable *hash_table, gconstpointer key)
#if GLIB_CHECK_VERSION(2,29,16)
static inline GPtrArray *
-babeltrace_g_ptr_array_new_full(guint reserved_size,
+bt_g_ptr_array_new_full(guint reserved_size,
GDestroyNotify element_free_func)
{
return g_ptr_array_new_full(reserved_size, element_free_func);
@@ -65,7 +65,7 @@ babeltrace_g_ptr_array_new_full(guint reserved_size,
#else
static inline GPtrArray *
-babeltrace_g_ptr_array_new_full(guint reserved_size,
+bt_g_ptr_array_new_full(guint reserved_size,
GDestroyNotify element_free_func)
{
GPtrArray *array;
diff --git a/lib/values.c b/lib/values.c
index 5e7f55c..345ef71 100644
--- a/lib/values.c
+++ b/lib/values.c
@@ -606,7 +606,7 @@ struct bt_value *bt_value_array_create(void)
}
array_obj->base = bt_value_create_base(BT_VALUE_TYPE_ARRAY);
- array_obj->garray = babeltrace_g_ptr_array_new_full(0,
+ array_obj->garray = bt_g_ptr_array_new_full(0,
(GDestroyNotify) bt_put);
if (!array_obj->garray) {
@@ -1029,7 +1029,7 @@ bool bt_value_map_has_key(const struct bt_value *map_obj, const char *key)
}
quark = g_quark_from_string(key);
- ret = babeltrace_g_hash_table_contains(typed_map_obj->ght,
+ ret = bt_g_hash_table_contains(typed_map_obj->ght,
GUINT_TO_POINTER(quark));
end:
--
2.7.4
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH babeltrace 4/4] Cleanup: bt namespace for compat memstream.h
[not found] <1473899550-30486-1-git-send-email-mjeanson@efficios.com>
2016-09-15 0:32 ` [PATCH babeltrace 2/4] Cleanup: bt namespace for compat timegm Michael Jeanson
2016-09-15 0:32 ` [PATCH babeltrace 3/4] Cleanup: bt namespace for compat glib Michael Jeanson
@ 2016-09-15 0:32 ` Michael Jeanson
2017-05-26 13:49 ` [PATCH babeltrace 1/4] Cleanup: bt namespace for compat strerror_r Jérémie Galarneau
3 siblings, 0 replies; 4+ messages in thread
From: Michael Jeanson @ 2016-09-15 0:32 UTC (permalink / raw)
To: lttng-dev; +Cc: jgalar
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
formats/ctf/ctf.c | 6 +++---
formats/lttng-live/lttng-live-comm.c | 10 +++++-----
include/babeltrace/compat/memstream.h | 16 ++++++++--------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 597e8d2..475d6f7 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -1415,7 +1415,7 @@ int ctf_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
* because its size includes garbage at the end (after final
* \0). This is the allocated size, not the actual string size.
*/
- out = babeltrace_open_memstream(buf, &size);
+ out = bt_open_memstream(buf, &size);
if (out == NULL) {
perror("Metadata open_memstream");
return -errno;
@@ -1431,7 +1431,7 @@ int ctf_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
}
}
/* close to flush the buffer */
- ret = babeltrace_close_memstream(buf, &size, out);
+ ret = bt_close_memstream(buf, &size, out);
if (ret < 0) {
int closeret;
@@ -1453,7 +1453,7 @@ int ctf_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
*fp = NULL;
return -ENOENT;
}
- *fp = babeltrace_fmemopen(*buf, buflen, "rb");
+ *fp = bt_fmemopen(*buf, buflen, "rb");
if (!*fp) {
perror("Metadata fmemopen");
return -errno;
diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index cd146d7..19f2ea8 100644
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -408,7 +408,7 @@ int open_metadata_fp_write(struct lttng_live_viewer_stream *stream,
int ret = 0;
stream->metadata_fp_write =
- babeltrace_open_memstream(metadata_buf, size);
+ bt_open_memstream(metadata_buf, size);
if (!stream->metadata_fp_write) {
perror("Metadata open_memstream");
ret = -1;
@@ -610,7 +610,7 @@ int append_metadata(struct lttng_live_ctx *ctx,
metadata = viewer_stream->ctf_trace->metadata_stream;
metadata->ctf_trace->metadata_fp =
- babeltrace_fmemopen(metadata_buf,
+ bt_fmemopen(metadata_buf,
metadata->metadata_len, "rb");
if (!metadata->ctf_trace->metadata_fp) {
perror("Metadata fmemopen");
@@ -944,9 +944,9 @@ int get_new_metadata(struct lttng_live_ctx *ctx,
}
} while (ret > 0 || !len_read);
- if (babeltrace_close_memstream(metadata_buf, &size,
+ if (bt_close_memstream(metadata_buf, &size,
metadata_stream->metadata_fp_write)) {
- perror("babeltrace_close_memstream");
+ perror("bt_close_memstream");
}
metadata_stream->metadata_fp_write = NULL;
@@ -1432,7 +1432,7 @@ int add_one_trace(struct lttng_live_ctx *ctx,
goto end_free;
}
- trace->metadata_fp = babeltrace_fmemopen(metadata_buf,
+ trace->metadata_fp = bt_fmemopen(metadata_buf,
stream->metadata_len, "rb");
if (!trace->metadata_fp) {
perror("Metadata fmemopen");
diff --git a/include/babeltrace/compat/memstream.h b/include/babeltrace/compat/memstream.h
index 8689aa7..38b6e3f 100644
--- a/include/babeltrace/compat/memstream.h
+++ b/include/babeltrace/compat/memstream.h
@@ -31,7 +31,7 @@
#include <stdio.h>
static inline
-FILE *babeltrace_fmemopen(void *buf, size_t size, const char *mode)
+FILE *bt_fmemopen(void *buf, size_t size, const char *mode)
{
return fmemopen(buf, size, mode);
}
@@ -46,7 +46,7 @@ FILE *babeltrace_fmemopen(void *buf, size_t size, const char *mode)
* temporary file, and use that file as FILE * input.
*/
static inline
-FILE *babeltrace_fmemopen(void *buf, size_t size, const char *mode)
+FILE *bt_fmemopen(void *buf, size_t size, const char *mode)
{
char tmpname[PATH_MAX];
size_t len;
@@ -108,13 +108,13 @@ error_unlink:
#include <stdio.h>
static inline
-FILE *babeltrace_open_memstream(char **ptr, size_t *sizeloc)
+FILE *bt_open_memstream(char **ptr, size_t *sizeloc)
{
return open_memstream(ptr, sizeloc);
}
static inline
-int babeltrace_close_memstream(char **buf, size_t *size, FILE *fp)
+int bt_close_memstream(char **buf, size_t *size, FILE *fp)
{
return fclose(fp);
}
@@ -126,12 +126,12 @@ int babeltrace_close_memstream(char **buf, size_t *size, FILE *fp)
/*
* Fallback for systems which don't have open_memstream. Create FILE *
- * with babeltrace_open_memstream, but require call to
- * babeltrace_close_memstream to flush all data written to the FILE *
+ * with bt_open_memstream, but require call to
+ * bt_close_memstream to flush all data written to the FILE *
* into the buffer (which we allocate).
*/
static inline
-FILE *babeltrace_open_memstream(char **ptr, size_t *sizeloc)
+FILE *bt_open_memstream(char **ptr, size_t *sizeloc)
{
char tmpname[PATH_MAX];
int ret;
@@ -167,7 +167,7 @@ error_unlink:
/* Get file size, allocate buffer, copy. */
static inline
-int babeltrace_close_memstream(char **buf, size_t *size, FILE *fp)
+int bt_close_memstream(char **buf, size_t *size, FILE *fp)
{
size_t len, n;
long pos;
--
2.7.4
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH babeltrace 1/4] Cleanup: bt namespace for compat strerror_r
[not found] <1473899550-30486-1-git-send-email-mjeanson@efficios.com>
` (2 preceding siblings ...)
2016-09-15 0:32 ` [PATCH babeltrace 4/4] Cleanup: bt namespace for compat memstream.h Michael Jeanson
@ 2017-05-26 13:49 ` Jérémie Galarneau
3 siblings, 0 replies; 4+ messages in thread
From: Jérémie Galarneau @ 2017-05-26 13:49 UTC (permalink / raw)
To: Michael Jeanson; +Cc: lttng-dev, Jeremie Galarneau
All four patches were merged in master, thanks!
Jérémie
On 14 September 2016 at 20:32, Michael Jeanson <mjeanson@efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> include/babeltrace/babeltrace-internal.h | 4 ++--
> include/babeltrace/compat/string.h | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
> index 2f15a68..6384eee 100644
> --- a/include/babeltrace/babeltrace-internal.h
> +++ b/include/babeltrace/babeltrace-internal.h
> @@ -84,14 +84,14 @@ extern int babeltrace_verbose, babeltrace_debug;
> #define _bt_printf_perror(fp, fmt, args...) \
> ({ \
> char buf[PERROR_BUFLEN] = "Error in strerror_r()"; \
> - compat_strerror_r(errno, buf, sizeof(buf)); \
> + bt_strerror_r(errno, buf, sizeof(buf)); \
> _bt_printfe(fp, "error", buf, fmt, ## args); \
> })
>
> #define _bt_printfl_perror(fp, lineno, fmt, args...) \
> ({ \
> char buf[PERROR_BUFLEN] = "Error in strerror_r()"; \
> - compat_strerror_r(errno, buf, sizeof(buf)); \
> + bt_strerror_r(errno, buf, sizeof(buf)); \
> _bt_printfle(fp, "error", lineno, buf, fmt, ## args); \
> })
>
> diff --git a/include/babeltrace/compat/string.h b/include/babeltrace/compat/string.h
> index 6092616..2aa7bc3 100644
> --- a/include/babeltrace/compat/string.h
> +++ b/include/babeltrace/compat/string.h
> @@ -30,7 +30,7 @@
>
> /* XSI-compliant strerror_r */
> static inline
> -int compat_strerror_r(int errnum, char *buf, size_t buflen)
> +int bt_strerror_r(int errnum, char *buf, size_t buflen)
> {
> return strerror_r(errnum, buf, buflen);
> }
> @@ -39,7 +39,7 @@ int compat_strerror_r(int errnum, char *buf, size_t buflen)
>
> /* GNU-compliant strerror_r */
> static inline
> -int compat_strerror_r(int errnum, char *buf, size_t buflen)
> +int bt_strerror_r(int errnum, char *buf, size_t buflen)
> {
> char *retbuf;
>
> --
> 2.7.4
>
--
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-05-26 13:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1473899550-30486-1-git-send-email-mjeanson@efficios.com>
2016-09-15 0:32 ` [PATCH babeltrace 2/4] Cleanup: bt namespace for compat timegm Michael Jeanson
2016-09-15 0:32 ` [PATCH babeltrace 3/4] Cleanup: bt namespace for compat glib Michael Jeanson
2016-09-15 0:32 ` [PATCH babeltrace 4/4] Cleanup: bt namespace for compat memstream.h Michael Jeanson
2017-05-26 13:49 ` [PATCH babeltrace 1/4] Cleanup: bt namespace for compat strerror_r Jérémie Galarneau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.