X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context-hostname.c;h=a16da3507de719e7a8468f96aa268018103de916;hb=263b6c88138c3354d63dba3c70a965de94becd22;hp=4ecee6355162292027ef3799f59ab55441a1c07e;hpb=13ab8b0a749053960f81a4924a3ed27775518f94;p=lttng-modules.git

diff --git a/lttng-context-hostname.c b/lttng-context-hostname.c
index 4ecee635..a16da350 100644
--- a/lttng-context-hostname.c
+++ b/lttng-context-hostname.c
@@ -1,33 +1,20 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
  * lttng-context-hostname.c
  *
  * LTTng hostname context.
  *
  * Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/utsname.h>
-#include "lttng-events.h"
-#include "wrapper/ringbuffer/frontend_types.h"
-#include "wrapper/vmalloc.h"
-#include "lttng-tracer.h"
+#include <lttng-events.h>
+#include <wrapper/ringbuffer/frontend_types.h>
+#include <wrapper/vmalloc.h>
+#include <lttng-tracer.h>
 
 #define LTTNG_HOSTNAME_CTX_LEN	(__NEW_UTS_LEN + 1)
 
@@ -65,6 +52,32 @@ void hostname_record(struct lttng_ctx_field *field,
 	}
 }
 
+static
+void hostname_get_value(struct lttng_ctx_field *field,
+		struct lttng_probe_ctx *lttng_probe_ctx,
+		union lttng_ctx_value *value)
+{
+	struct nsproxy *nsproxy;
+	struct uts_namespace *ns;
+	char *hostname;
+
+	/*
+	 * No need to take the RCU read-side lock to read current
+	 * nsproxy. (documented in nsproxy.h)
+	 */
+	nsproxy = current->nsproxy;
+	if (nsproxy) {
+		ns = nsproxy->uts_ns;
+		hostname = ns->name.nodename;
+	} else {
+		hostname = "";
+	}
+	value->str = hostname;
+}
+
+static const struct lttng_type hostname_array_elem_type =
+	__type_integer(char, 0, 0, -1, __BYTE_ORDER, 10, UTF8);
+
 int lttng_add_hostname_to_ctx(struct lttng_ctx **ctx)
 {
 	struct lttng_ctx_field *field;
@@ -77,27 +90,17 @@ int lttng_add_hostname_to_ctx(struct lttng_ctx **ctx)
 		return -EEXIST;
 	}
 	field->event_field.name = "hostname";
-	field->event_field.type.atype = atype_array;
-	field->event_field.type.u.array.elem_type.atype = atype_integer;
-	field->event_field.type.u.array.elem_type.u.basic.integer.size = sizeof(char) * CHAR_BIT;
-	field->event_field.type.u.array.elem_type.u.basic.integer.alignment = lttng_alignof(char) * CHAR_BIT;
-	field->event_field.type.u.array.elem_type.u.basic.integer.signedness = lttng_is_signed_type(char);
-	field->event_field.type.u.array.elem_type.u.basic.integer.reverse_byte_order = 0;
-	field->event_field.type.u.array.elem_type.u.basic.integer.base = 10;
-	field->event_field.type.u.array.elem_type.u.basic.integer.encoding = lttng_encode_UTF8;
-	field->event_field.type.u.array.length = LTTNG_HOSTNAME_CTX_LEN;
+	field->event_field.type.atype = atype_array_nestable;
+	field->event_field.type.u.array_nestable.elem_type =
+		&hostname_array_elem_type;
+	field->event_field.type.u.array_nestable.length = LTTNG_HOSTNAME_CTX_LEN;
+	field->event_field.type.u.array_nestable.alignment = 0;
 
 	field->get_size = hostname_get_size;
 	field->record = hostname_record;
-	wrapper_vmalloc_sync_all();
+	field->get_value = hostname_get_value;
+	lttng_context_update(*ctx);
+	wrapper_vmalloc_sync_mappings();
 	return 0;
 }
 EXPORT_SYMBOL_GPL(lttng_add_hostname_to_ctx);
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Mathieu Desnoyers");
-MODULE_DESCRIPTION("Linux Trace Toolkit Perf Support");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-	__stringify(LTTNG_MODULES_MINOR_VERSION) "."
-	__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-	LTTNG_MODULES_EXTRAVERSION);