#include <linux/proc_fs.h>
#include <linux/slab.h>
#include <linux/mm.h>
+#include <linux/miscdevice.h>
#include <wrapper/vmalloc.h>
#include <lttng-events.h>
#define TP_MODULE_NOAUTOLOAD
#define LTTNG_PACKAGE_BUILD
#define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
+#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
#define TRACE_INCLUDE_FILE lttng
#define LTTNG_INSTRUMENTATION
ssize_t lttng_logger_write(struct file *file, const char __user *user_buf,
size_t count, loff_t *ppos)
{
- unsigned int nr_pages = 1, i;
+ int nr_pages = 1, i;
unsigned long uaddr = (unsigned long) user_buf;
struct page *pages[2];
ssize_t written;
.write = lttng_logger_write,
};
+static struct miscdevice logger_dev = {
+ .minor = MISC_DYNAMIC_MINOR,
+ .name = "lttng-logger",
+ .mode = 0666,
+ .fops = <tng_logger_operations
+};
+
int __init lttng_logger_init(void)
{
int ret = 0;
wrapper_vmalloc_sync_all();
+
+ /* /dev/lttng-logger */
+ ret = misc_register(&logger_dev);
+ if (ret) {
+ printk(KERN_ERR "Error creating LTTng logger device\n");
+ goto error;
+ }
+
+ /* /proc/lttng-logger */
lttng_logger_dentry = proc_create_data(LTTNG_LOGGER_FILE,
S_IRUGO | S_IWUGO, NULL,
<tng_logger_operations, NULL);
if (!lttng_logger_dentry) {
- printk(KERN_ERR "Error creating LTTng logger file\n");
+ printk(KERN_ERR "Error creating LTTng logger proc file\n");
ret = -ENOMEM;
- goto error;
+ goto error_proc;
}
+
+ /* Init */
ret = __lttng_events_init__lttng();
if (ret)
goto error_events;
error_events:
remove_proc_entry("lttng-logger", NULL);
+error_proc:
+ misc_deregister(&logger_dev);
error:
return ret;
}
-void __exit lttng_logger_exit(void)
+void lttng_logger_exit(void)
{
__lttng_events_exit__lttng();
if (lttng_logger_dentry)
remove_proc_entry("lttng-logger", NULL);
+ misc_deregister(&logger_dev);
}