* Copyright (C) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License only.
*
- * This program 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 General Public License for
- * more details.
+ * This program 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 General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _LARGEFILE64_SOURCE
+#define _GNU_SOURCE
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/wait.h>
#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <assert.h>
#include <sys/socket.h>
-#include <ust/lttng-ust-comm.h>
+#include <ust-comm.h>
+#include <lttng/ust-error.h>
#include <../../libringbuffer/backend.h>
#include <../../libringbuffer/frontend.h>
+#include "../../liblttng-ust/compat.h" /* For ENODATA */
#define NR_SESSIONS 4
#define NR_CHANNELS 1
stream_datas[k].handle = lur.ret_val;
printf("received stream handle %u\n",
stream_datas[k].handle);
- if (lur.ret_code == USTCOMM_OK) {
+ if (lur.ret_code == LTTNG_UST_OK) {
ssize_t len;
stream_datas[k].memory_map_size = lur.u.stream.memory_map_size;
}
k++;
}
- if (ret == -ENOENT)
+ if (ret == -LTTNG_UST_ERR_NOENT)
break;
if (ret)
return ret;
}
static
-struct shm_handle *map_channel(struct lttng_ust_object_data *chan_data,
+struct lttng_ust_shm_handle *map_channel(struct lttng_ust_object_data *chan_data,
struct lttng_ust_object_data *stream_datas, int nr_check)
{
- struct shm_handle *handle;
+ struct lttng_ust_shm_handle *handle;
struct channel *chan;
int k, ret;
}
static
-void unmap_channel(struct shm_handle *handle)
+void unmap_channel(struct lttng_ust_shm_handle *handle)
{
struct channel *chan;
}
static
-int consume_stream(struct shm_handle *handle, int cpu, char *outfile)
+int consume_stream(struct lttng_ust_shm_handle *handle, int cpu, char *outfile)
{
struct channel *chan;
- struct lib_ring_buffer *buf;
+ struct lttng_ust_lib_ring_buffer *buf;
int outfd, ret;
- int shm_fd, wait_fd;
- uint64_t memory_map_size;
+ int *shm_fd, *wait_fd;
+ uint64_t *memory_map_size;
chan = shmp(handle, handle->chan);
}
/* copy */
- outfd = open(outfile, O_WRONLY | O_CREAT | O_LARGEFILE | O_TRUNC,
+ outfd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (outfd < 0) {
perror("open output");
printf("WRITE: copy %lu bytes\n", read_size);
copy_size = write(outfd, ptr, read_size);
if (copy_size < read_size) {
- printf("write issue: copied %zd, expected %lu\n", copy_size, read_size);
+ printf("write issue: copied %lu, expected %lu\n", copy_size, read_size);
}
lib_ring_buffer_put_next_subbuf(buf, handle);
}
for (i = 0; i < NR_SESSIONS; i++) {
char pathname[PATH_MAX];
- struct shm_handle *handle;
+ struct lttng_ust_shm_handle *handle;
snprintf(pathname, PATH_MAX - 1, "/tmp/testtrace%u", i);
old_umask = umask(0);
return ret;
metadata_data[i].handle = lur.ret_val;
printf("received metadata handle %u\n", metadata_data[i].handle);
- if (lur.ret_code == USTCOMM_OK) {
+ if (lur.ret_code == LTTNG_UST_OK) {
ssize_t len;
metadata_data[i].memory_map_size = lur.u.channel.memory_map_size;
return ret;
channel_data[i][j].handle = lur.ret_val;
printf("received channel handle %u\n", channel_data[i][j].handle);
- if (lur.ret_code == USTCOMM_OK) {
+ if (lur.ret_code == LTTNG_UST_OK) {
ssize_t len;
channel_data[i][j].memory_map_size = lur.u.channel.memory_map_size;
int main(int argc, char **argv)
{
const char *home_dir;
+ char home_rundir[PATH_MAX];
+ char *cmd = NULL;
int ret, wait_shm_fd;
struct sigaction act;
mode_t old_umask = 0;
strcpy(apps_sock_path, DEFAULT_GLOBAL_APPS_UNIX_SOCK);
old_umask = umask(0);
} else {
+ home_dir = (const char *) getenv("HOME");
+ if (!home_dir) {
+ perror("getenv error");
+ return -ENOENT;
+ }
+
+ snprintf(home_rundir, PATH_MAX,
+ LTTNG_HOME_RUNDIR, home_dir);
+
+ ret = mkdir(home_rundir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+ if (ret && errno != EEXIST) {
+ perror("mkdir");
+ return -1;
+ }
+
snprintf(local_apps_wait_shm_path, PATH_MAX,
DEFAULT_HOME_APPS_WAIT_SHM_PATH, getuid());
wait_shm_fd = get_wait_shm(local_apps_wait_shm_path,
perror("local wait shm error");
return -1;
}
- home_dir = (const char *) getenv("HOME");
- if (!home_dir) {
- perror("getenv error");
- return -ENOENT;
- }
snprintf(apps_sock_path, PATH_MAX,
DEFAULT_HOME_APPS_UNIX_SOCK, home_dir);
}
pid_t ppid;
uid_t uid;
gid_t gid;
+ uint32_t bits_per_long;
char name[16]; /* Process name */
} reg_msg;
char bufname[17];
return -1;
}
+ if (geteuid()) {
+ printf("Removing %s directory\n", home_rundir);
+ ret = asprintf(&cmd, "rm -rf %s", home_rundir);
+ if (ret < 0) {
+ printf("asprintf failed. Something is really wrong!\n");
+ return -1;
+ }
+
+ /* Remove lttng run directory */
+ ret = system(cmd);
+ if (ret < 0) {
+ printf("Unable to clean %s\n", home_rundir);
+ return -1;
+ }
+ }
+
return 0;
}