git-lng-odp July 2017

git-lng-odp@lists.linaro.org

1 participants
35 discussions

[COMMIT] branch master updated. v1.15.0.0-30-g2541e868

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 2541e8688750f2a045aff3dbf544868be3ebf787 (commit) via b2b516c03ae6eb57e0055c98b33e946e9529f215 (commit) via d5d52b65d262698694a5fab0b3d9bd12fa4a6460 (commit) via 6e594990575df83dcbb70f5f86ad52f7c5a0f96d (commit) via c50d47bd420c675552dd0b82638a073b67b2ae4f (commit) via 933fd66f5b7230a00ee0ef7acde5cc1c9af63b45 (commit) via 8ae6373c8844408ad080b58fb3083b30e8dc7ea6 (commit) from 96b36df87f23bf32ab218321f1fc35703f092eb4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2541e8688750f2a045aff3dbf544868be3ebf787 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jul 4 19:31:06 2017 +0300 linux-gen: shm: user can define place for shm files Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 6545bfce..cde2dbc3 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -71,6 +71,8 @@ #include <inttypes.h> #include <sys/wait.h> #include <libgen.h> +#include <sys/types.h> +#include <dirent.h> /* * Maximum number of internal shared memory blocks. @@ -99,6 +101,7 @@ #define ISHM_FILENAME_MAXLEN (ISHM_NAME_MAXLEN + 64) #define ISHM_FILENAME_FORMAT "%s/odp-%d-ishm-%s" #define ISHM_FILENAME_NORMAL_PAGE_DIR "/dev/shm" +#define _ODP_FILES_FMT "odp-%d-" /* * when the memory is to be shared with an external entity (such as another @@ -106,7 +109,7 @@ * export file is created describing the exported memory: this defines the * location and the filename format of this description file */ -#define ISHM_EXPTNAME_FORMAT "/dev/shm/%s/odp-%d-shm-%s" +#define ISHM_EXPTNAME_FORMAT "%s/%s/odp-%d-shm-%s" /* * At worse case the virtual space gets so fragmented that there is @@ -437,7 +440,7 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, odp_global_data.uid); else snprintf(dir, ISHM_FILENAME_MAXLEN, "%s/%s", - ISHM_FILENAME_NORMAL_PAGE_DIR, + odp_global_data.shm_dir, odp_global_data.uid); snprintf(filename, ISHM_FILENAME_MAXLEN, @@ -476,6 +479,7 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, ISHM_FILENAME_MAXLEN - 1); snprintf(new_block->exptname, ISHM_FILENAME_MAXLEN, ISHM_EXPTNAME_FORMAT, + odp_global_data.shm_dir, odp_global_data.uid, odp_global_data.main_pid, (name && name[0]) ? name : seq_string); @@ -955,6 +959,7 @@ int _odp_ishm_find_exported(const char *remote_name, pid_t external_odp_pid, /* try to read the block description file: */ snprintf(export_filename, ISHM_FILENAME_MAXLEN, ISHM_EXPTNAME_FORMAT, + odp_global_data.shm_dir, odp_global_data.uid, external_odp_pid, remote_name); @@ -1383,22 +1388,86 @@ static int do_odp_ishm_init_local(void) return 0; } +/* remove all files staring with "odp-<pid>" from a directory "dir" */ +int _odp_ishm_cleanup_files(const char *dirpath) +{ + struct dirent *e; + DIR *dir; + char userdir[PATH_MAX]; + char prefix[PATH_MAX]; + char *fullpath; + int d_len = strlen(dirpath); + int p_len; + int f_len; + + snprintf(userdir, PATH_MAX, "%s/%s", dirpath, odp_global_data.uid); + + dir = opendir(userdir); + if (!dir) { + /* ok if the dir does not exist. no much to delete then! */ + ODP_DBG("opendir failed for %s: %s\n", + dirpath, strerror(errno)); + return 0; + } + snprintf(prefix, PATH_MAX, _ODP_FILES_FMT, odp_global_data.main_pid); + p_len = strlen(prefix); + while ((e = readdir(dir)) != NULL) { + if (strncmp(e->d_name, prefix, p_len) == 0) { + f_len = strlen(e->d_name); + fullpath = malloc(d_len + f_len + 2); + if (fullpath == NULL) { + closedir(dir); + return -1; + } + snprintf(fullpath, PATH_MAX, "%s/%s", + dirpath, e->d_name); + ODP_DBG("deleting obsolete file: %s\n", fullpath); + if (unlink(fullpath)) + ODP_ERR("unlink failed for %s: %s\n", + fullpath, strerror(errno)); + free(fullpath); + } + } + closedir(dir); + + return 0; +} + int _odp_ishm_init_global(void) { void *addr; void *spce_addr; int i; + uid_t uid; - if ((getpid() != odp_global_data.main_pid) || - (syscall(SYS_gettid) != getpid())) - ODP_ERR("odp_init_global() must be performed by the main " + odp_global_data.main_pid = getpid(); + odp_global_data.shm_dir = getenv("ODP_SHM_DIR"); + odp_global_data.shm_dir = + calloc(1, sizeof(ISHM_FILENAME_NORMAL_PAGE_DIR)); + sprintf(odp_global_data.shm_dir, "%s", ISHM_FILENAME_NORMAL_PAGE_DIR); + + ODP_DBG("ishm: using dir %s\n", odp_global_data.shm_dir); + + uid = getuid(); + snprintf(odp_global_data.uid, UID_MAXLEN, "%d", + uid); + + if ((syscall(SYS_gettid)) != odp_global_data.main_pid) { + ODP_ERR("ishm init must be performed by the main " "ODP process!\n."); + return -1; + } if (!odp_global_data.hugepage_info.default_huge_page_dir) ODP_DBG("NOTE: No support for huge pages\n"); - else + else { ODP_DBG("Huge pages mount point is: %s\n", odp_global_data.hugepage_info.default_huge_page_dir); + _odp_ishm_cleanup_files( + odp_global_data.hugepage_info.default_huge_page_dir); + } + + _odp_ishm_cleanup_files(odp_global_data.shm_dir); /* allocate space for the internal shared mem block table: */ addr = mmap(NULL, sizeof(ishm_table_t), @@ -1592,6 +1661,8 @@ int _odp_ishm_term_global(void) if (_odp_ishmphy_unbook_va()) ret |= -1; + free(odp_global_data.shm_dir); + return ret; } diff --git a/platform/linux-generic/include/_ishm_internal.h b/platform/linux-generic/include/_ishm_internal.h index c7c33077..005d6b55 100644 --- a/platform/linux-generic/include/_ishm_internal.h +++ b/platform/linux-generic/include/_ishm_internal.h @@ -44,6 +44,7 @@ int _odp_ishm_find_exported(const char *remote_name, void *_odp_ishm_address(int block_index); int _odp_ishm_info(int block_index, _odp_ishm_info_t *info); int _odp_ishm_status(const char *title); +int _odp_ishm_cleanup_files(const char *dirpath); #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 7e6811f3..dd3374b7 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -42,6 +42,7 @@ typedef struct { } hugepage_info_t; struct odp_global_data_s { + char *shm_dir; /*< directory for odp mmaped files */ pid_t main_pid; char uid[UID_MAXLEN]; odp_log_func_t log_fn; diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index f62ccec0..ab2d6fb0 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -20,70 +20,15 @@ #include <sys/types.h> #include <pwd.h> -#define _ODP_FILES_FMT "odp-%d-" -#define _ODP_TMPDIR "/dev/shm" - struct odp_global_data_s odp_global_data; -/* remove all files staring with "odp-<pid>" from a directory "dir" */ -static int cleanup_files(const char *dirpath, int odp_pid) -{ - struct dirent *e; - DIR *dir; - char userdir[PATH_MAX]; - char prefix[PATH_MAX]; - char *fullpath; - int d_len = strlen(dirpath); - int p_len; - int f_len; - - snprintf(userdir, PATH_MAX, "%s/%s", dirpath, odp_global_data.uid); - - dir = opendir(userdir); - if (!dir) { - /* ok if the dir does not exist. no much to delete then! */ - ODP_DBG("opendir failed for %s: %s\n", - dirpath, strerror(errno)); - return 0; - } - snprintf(prefix, PATH_MAX, _ODP_FILES_FMT, odp_pid); - p_len = strlen(prefix); - while ((e = readdir(dir)) != NULL) { - if (strncmp(e->d_name, prefix, p_len) == 0) { - f_len = strlen(e->d_name); - fullpath = malloc(d_len + f_len + 2); - if (fullpath == NULL) { - closedir(dir); - return -1; - } - snprintf(fullpath, PATH_MAX, "%s/%s", - dirpath, e->d_name); - ODP_DBG("deleting obsolete file: %s\n", fullpath); - if (unlink(fullpath)) - ODP_ERR("unlink failed for %s: %s\n", - fullpath, strerror(errno)); - free(fullpath); - } - } - closedir(dir); - - return 0; -} - int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params ODP_UNUSED) { - char *hpdir; - uid_t uid; - memset(&odp_global_data, 0, sizeof(struct odp_global_data_s)); odp_global_data.main_pid = getpid(); - uid = getuid(); - snprintf(odp_global_data.uid, UID_MAXLEN, "%d", - uid); - enum init_stage stage = NO_INIT; odp_global_data.log_fn = odp_override_log; odp_global_data.abort_fn = odp_override_abort; @@ -95,8 +40,6 @@ int odp_init_global(odp_instance_t *instance, odp_global_data.abort_fn = params->abort_fn; } - cleanup_files(_ODP_TMPDIR, odp_global_data.main_pid); - if (odp_cpumask_init_global(params)) { ODP_ERR("ODP cpumask init failed.\n"); goto init_failed; @@ -113,23 +56,20 @@ int odp_init_global(odp_instance_t *instance, ODP_ERR("ODP system_info init failed.\n"); goto init_failed; } - hpdir = odp_global_data.hugepage_info.default_huge_page_dir; - /* cleanup obsolete huge page files, if any */ - if (hpdir) - cleanup_files(hpdir, odp_global_data.main_pid); stage = SYSINFO_INIT; + if (_odp_ishm_init_global()) { + ODP_ERR("ODP ishm init failed.\n"); + goto init_failed; + } + stage = ISHM_INIT; + if (_odp_fdserver_init_global()) { ODP_ERR("ODP fdserver init failed.\n"); goto init_failed; } stage = FDSERVER_INIT; - if (_odp_ishm_init_global()) { - ODP_ERR("ODP ishm init failed.\n"); - goto init_failed; - } - stage = ISHM_INIT; if (odp_thread_init_global()) { ODP_ERR("ODP thread init failed.\n"); diff --git a/test/linux-generic/validation/api/shmem/shmem_common.h b/test/linux-generic/validation/api/shmem/shmem_common.h index 621e3431..e6c04d81 100644 --- a/test/linux-generic/validation/api/shmem/shmem_common.h +++ b/test/linux-generic/validation/api/shmem/shmem_common.h @@ -7,8 +7,9 @@ #ifndef _COMMON_TEST_SHMEM_H_ #define _COMMON_TEST_SHMEM_H_ -#define ODP_SHM_NAME "odp_linux_shared_mem" -#define FIFO_NAME_FMT "/dev/shm/%d/shmem_test_fifo-%d" +#define SHM_NAME "odp_linux_shared_mem" +#define DEFAULT_SHM_DIR "/dev/shm" +#define FIFO_NAME_FMT "/%s/%d/shmem_test_fifo-%d" #define ALIGN_SIZE (128) #define TEST_SHARE_FOO (0xf0f0f0f0) #define TEST_SHARE_BAR (0xf0f0f0f) diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.c b/test/linux-generic/validation/api/shmem/shmem_linux.c index d5931447..e7e699e7 100644 --- a/test/linux-generic/validation/api/shmem/shmem_linux.c +++ b/test/linux-generic/validation/api/shmem/shmem_linux.c @@ -79,6 +79,7 @@ #include <linux/limits.h> #include <inttypes.h> #include <pwd.h> +#include <stdlib.h> #include "shmem_linux.h" #include "shmem_common.h" @@ -210,6 +211,7 @@ int main(int argc __attribute__((unused)), char *argv[]) test_shared_linux_data_t *addr; int app2_status; uid_t uid = getuid(); + char *shm_dir = getenv("ODP_SHM_DIR"); /* odp_app1 is in the same directory as this file: */ strncpy(prg_name, argv[0], PATH_MAX - 1); @@ -228,7 +230,9 @@ int main(int argc __attribute__((unused)), char *argv[]) /* wait max 30 sec for the fifo to be created by the ODP side. * Just die if time expire as there is no fifo to communicate * through... */ - sprintf(fifo_name, FIFO_NAME_FMT, uid, odp_app1); + sprintf(fifo_name, FIFO_NAME_FMT, + shm_dir ? shm_dir : DEFAULT_SHM_DIR, + uid, odp_app1); for (nb_sec = 0; nb_sec < MAX_FIFO_WAIT; nb_sec++) { fifo_fd = open(fifo_name, O_WRONLY); if (fifo_fd >= 0) @@ -244,7 +248,7 @@ int main(int argc __attribute__((unused)), char *argv[]) * check to see if linux can see the created shared memory: */ /* read the shared memory attributes (includes the shm filename): */ - if (read_shmem_attribues(odp_app1, ODP_SHM_NAME, + if (read_shmem_attribues(odp_app1, SHM_NAME, shm_filename, &len, &flags, &user_len, &user_flags, &align) != 0) test_failure(fifo_name, fifo_fd, odp_app1); diff --git a/test/linux-generic/validation/api/shmem/shmem_odp1.c b/test/linux-generic/validation/api/shmem/shmem_odp1.c index c402365a..26abc94b 100644 --- a/test/linux-generic/validation/api/shmem/shmem_odp1.c +++ b/test/linux-generic/validation/api/shmem/shmem_odp1.c @@ -11,6 +11,7 @@ #include <stdio.h> #include <sys/stat.h> #include <fcntl.h> +#include <stdlib.h> #include <odp_cunit_common.h> #include "shmem_odp1.h" @@ -26,9 +27,10 @@ void shmem_test_odp_shm_proc(void) odp_shm_t shm; test_shared_data_t *test_shared_data; char test_result; + char *shm_dir = getenv("ODP_SHM_DIR"); /* reminder: ODP_SHM_PROC => export to linux, ODP_SHM_EXPORT=>to odp */ - shm = odp_shm_reserve(ODP_SHM_NAME, + shm = odp_shm_reserve(SHM_NAME, sizeof(test_shared_data_t), ALIGN_SIZE, ODP_SHM_PROC | ODP_SHM_EXPORT); CU_ASSERT_FATAL(ODP_SHM_INVALID != shm); @@ -41,7 +43,9 @@ void shmem_test_odp_shm_proc(void) /* open the fifo: this will indicate to linux process that it can * start the shmem lookups and check if it sees the data */ - sprintf(fifo_name, FIFO_NAME_FMT, getuid(), getpid()); + sprintf(fifo_name, FIFO_NAME_FMT, + shm_dir ? shm_dir : DEFAULT_SHM_DIR, + getuid(), getpid()); CU_ASSERT_FATAL(mkfifo(fifo_name, 0666) == 0); /* read from the fifo: the linux process result: */ diff --git a/test/linux-generic/validation/api/shmem/shmem_odp2.c b/test/linux-generic/validation/api/shmem/shmem_odp2.c index 7d8c682b..2a4b67d7 100644 --- a/test/linux-generic/validation/api/shmem/shmem_odp2.c +++ b/test/linux-generic/validation/api/shmem/shmem_odp2.c @@ -53,8 +53,8 @@ int main(int argc, char *argv[]) odp1 = (odp_instance_t)atoi(argv[1]); printf("shmem_odp2: trying to grab %s from pid %d\n", - ODP_SHM_NAME, (int)odp1); - shm = odp_shm_import(ODP_SHM_NAME, odp1, ODP_SHM_NAME); + SHM_NAME, (int)odp1); + shm = odp_shm_import(SHM_NAME, odp1, SHM_NAME); if (shm == ODP_SHM_INVALID) { fprintf(stderr, "error: odp_shm_lookup_external failed.\n"); return 1; commit b2b516c03ae6eb57e0055c98b33e946e9529f215 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Fri Jun 23 19:16:52 2017 +0300 linux-gen: shm: add uid to shm files new processes can get some earliar pid numbers which processes can be already dead. Because of previous process can be from other user it can have different access right to that file. To avoid that place shm files to /dev/shm/uid/odp- files Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/_fdserver.c b/platform/linux-generic/_fdserver.c index 20d6e233..7ed5e7a6 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/_fdserver.c @@ -48,6 +48,7 @@ #include <stdlib.h> #include <errno.h> #include <string.h> +#include <sys/stat.h> #include <sys/types.h> #include <signal.h> #include <sys/socket.h> @@ -57,8 +58,9 @@ #include <sys/mman.h> #include <sys/wait.h> -#define FDSERVER_SOCKPATH_MAXLEN 32 -#define FDSERVER_SOCKPATH_FORMAT "/dev/shm/odp-%d-fdserver" +#define FDSERVER_SOCKPATH_MAXLEN 255 +#define FDSERVER_SOCK_FORMAT "/dev/shm/%s/odp-%d-fdserver" +#define FDSERVER_SOCKDIR_FORMAT "/dev/shm/%s" #define FDSERVER_BACKLOG 5 #ifndef MAP_ANONYMOUS @@ -238,7 +240,8 @@ static int get_socket(void) int len; /* construct the named socket path: */ - snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKPATH_FORMAT, + snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCK_FORMAT, + odp_global_data.uid, odp_global_data.main_pid); s_sock = socket(AF_UNIX, SOCK_STREAM, 0); @@ -581,8 +584,14 @@ int _odp_fdserver_init_global(void) odp_spinlock_init(client_lock); + snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKDIR_FORMAT, + odp_global_data.uid); + + mkdir(sockpath, 0744); + /* construct the server named socket path: */ - snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKPATH_FORMAT, + snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCK_FORMAT, + odp_global_data.uid, odp_global_data.main_pid); /* create UNIX domain socket: */ @@ -663,11 +672,17 @@ int _odp_fdserver_term_global(void) wait(&status); /* construct the server named socket path: */ - snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKPATH_FORMAT, + snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCK_FORMAT, + odp_global_data.uid, odp_global_data.main_pid); /* delete the UNIX domain socket: */ unlink(sockpath); + /* delete shm files directory */ + snprintf(sockpath, FDSERVER_SOCKPATH_MAXLEN, FDSERVER_SOCKDIR_FORMAT, + odp_global_data.uid); + unlink(sockpath); + return 0; } diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index c0623f18..6545bfce 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -86,7 +86,7 @@ * Maximum internal shared memory block name length in chars * probably taking the same number as SHM name size make sense at this stage */ -#define ISHM_NAME_MAXLEN 32 +#define ISHM_NAME_MAXLEN 128 /* * Linux underlying file name: <directory>/odp-<odp_pid>-ishm-<name> @@ -106,7 +106,7 @@ * export file is created describing the exported memory: this defines the * location and the filename format of this description file */ -#define ISHM_EXPTNAME_FORMAT "/dev/shm/odp-%d-shm-%s" +#define ISHM_EXPTNAME_FORMAT "/dev/shm/%s/odp-%d-shm-%s" /* * At worse case the virtual space gets so fragmented that there is @@ -417,6 +417,7 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, * /mnt/huge */ int oflag = O_RDWR | O_CREAT | O_TRUNC; /* flags for open */ FILE *export_file; + char dir[ISHM_FILENAME_MAXLEN]; new_block = &ishm_tbl->block[block_index]; name = new_block->name; @@ -431,17 +432,21 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, return -1; if (huge == HUGE) - snprintf(filename, ISHM_FILENAME_MAXLEN, - ISHM_FILENAME_FORMAT, + snprintf(dir, ISHM_FILENAME_MAXLEN, "%s/%s", odp_global_data.hugepage_info.default_huge_page_dir, - odp_global_data.main_pid, - (name && name[0]) ? name : seq_string); + odp_global_data.uid); else - snprintf(filename, ISHM_FILENAME_MAXLEN, - ISHM_FILENAME_FORMAT, + snprintf(dir, ISHM_FILENAME_MAXLEN, "%s/%s", ISHM_FILENAME_NORMAL_PAGE_DIR, - odp_global_data.main_pid, - (name && name[0]) ? name : seq_string); + odp_global_data.uid); + + snprintf(filename, ISHM_FILENAME_MAXLEN, + ISHM_FILENAME_FORMAT, + dir, + odp_global_data.main_pid, + (name && name[0]) ? name : seq_string); + + mkdir(dir, 0744); fd = open(filename, oflag, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd < 0) { @@ -471,6 +476,7 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, ISHM_FILENAME_MAXLEN - 1); snprintf(new_block->exptname, ISHM_FILENAME_MAXLEN, ISHM_EXPTNAME_FORMAT, + odp_global_data.uid, odp_global_data.main_pid, (name && name[0]) ? name : seq_string); export_file = fopen(new_block->exptname, "w"); @@ -949,6 +955,7 @@ int _odp_ishm_find_exported(const char *remote_name, pid_t external_odp_pid, /* try to read the block description file: */ snprintf(export_filename, ISHM_FILENAME_MAXLEN, ISHM_EXPTNAME_FORMAT, + odp_global_data.uid, external_odp_pid, remote_name); diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 8bae028d..7e6811f3 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -25,6 +25,7 @@ extern "C" { #include <sys/types.h> #define MAX_CPU_NUMBER 128 +#define UID_MAXLEN 30 typedef struct { uint64_t cpu_hz_max[MAX_CPU_NUMBER]; @@ -42,6 +43,7 @@ typedef struct { struct odp_global_data_s { pid_t main_pid; + char uid[UID_MAXLEN]; odp_log_func_t log_fn; odp_abort_func_t abort_fn; system_info_t system_info; diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index b4abb181..f62ccec0 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -17,6 +17,8 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#include <sys/types.h> +#include <pwd.h> #define _ODP_FILES_FMT "odp-%d-" #define _ODP_TMPDIR "/dev/shm" @@ -28,13 +30,16 @@ static int cleanup_files(const char *dirpath, int odp_pid) { struct dirent *e; DIR *dir; + char userdir[PATH_MAX]; char prefix[PATH_MAX]; char *fullpath; int d_len = strlen(dirpath); int p_len; int f_len; - dir = opendir(dirpath); + snprintf(userdir, PATH_MAX, "%s/%s", dirpath, odp_global_data.uid); + + dir = opendir(userdir); if (!dir) { /* ok if the dir does not exist. no much to delete then! */ ODP_DBG("opendir failed for %s: %s\n", @@ -70,10 +75,15 @@ int odp_init_global(odp_instance_t *instance, const odp_platform_init_t *platform_params ODP_UNUSED) { char *hpdir; + uid_t uid; memset(&odp_global_data, 0, sizeof(struct odp_global_data_s)); odp_global_data.main_pid = getpid(); + uid = getuid(); + snprintf(odp_global_data.uid, UID_MAXLEN, "%d", + uid); + enum init_stage stage = NO_INIT; odp_global_data.log_fn = odp_override_log; odp_global_data.abort_fn = odp_override_abort; diff --git a/test/linux-generic/validation/api/shmem/shmem_common.h b/test/linux-generic/validation/api/shmem/shmem_common.h index 16227ecd..621e3431 100644 --- a/test/linux-generic/validation/api/shmem/shmem_common.h +++ b/test/linux-generic/validation/api/shmem/shmem_common.h @@ -8,7 +8,7 @@ #define _COMMON_TEST_SHMEM_H_ #define ODP_SHM_NAME "odp_linux_shared_mem" -#define FIFO_NAME_FMT "/tmp/shmem_test_fifo-%d" +#define FIFO_NAME_FMT "/dev/shm/%d/shmem_test_fifo-%d" #define ALIGN_SIZE (128) #define TEST_SHARE_FOO (0xf0f0f0f0) #define TEST_SHARE_BAR (0xf0f0f0f) diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.c b/test/linux-generic/validation/api/shmem/shmem_linux.c index 2f4c7628..d5931447 100644 --- a/test/linux-generic/validation/api/shmem/shmem_linux.c +++ b/test/linux-generic/validation/api/shmem/shmem_linux.c @@ -8,7 +8,7 @@ * flag is visible under linux, and checks that memory created with the * ODP_SHM_EXPORT flag is visible by other ODP instances. * It therefore checks both that the link - * name under /tmp is correct, and also checks that the memory contents + * name under /dev/shm is correct, and also checks that the memory contents * is indeed shared. * we want: * -the odp test to run using C UNIT @@ -69,6 +69,7 @@ #include <string.h> #include <fcntl.h> #include <sys/stat.h> +#include <sys/types.h> #include <sys/wait.h> #include <linux/limits.h> #include <stdio.h> @@ -77,12 +78,14 @@ #include <libgen.h> #include <linux/limits.h> #include <inttypes.h> +#include <pwd.h> #include "shmem_linux.h" #include "shmem_common.h" #define ODP_APP1_NAME "shmem_odp1" /* name of the odp1 program, in this dir */ #define ODP_APP2_NAME "shmem_odp2" /* name of the odp2 program, in this dir */ -#define DEVNAME_FMT "/tmp/odp-%" PRIu64 "-shm-%s" /* odp-<pid>-shm-<name> */ +/* odp-<pid>-shm-<name> */ +#define DEVNAME_FMT "/dev/shm/%d/odp-%" PRIu64 "-shm-%s" #define MAX_FIFO_WAIT 30 /* Max time waiting for the fifo (sec) */ /* @@ -108,7 +111,8 @@ static int read_shmem_attribues(uint64_t ext_odp_pid, const char *blockname, char shm_attr_filename[PATH_MAX]; FILE *export_file; - sprintf(shm_attr_filename, DEVNAME_FMT, ext_odp_pid, blockname); + sprintf(shm_attr_filename, DEVNAME_FMT, getuid(), + ext_odp_pid, blockname); /* O_CREAT flag not given => failure if shm_attr_filename does not * already exist */ @@ -205,6 +209,7 @@ int main(int argc __attribute__((unused)), char *argv[]) int shm_fd; test_shared_linux_data_t *addr; int app2_status; + uid_t uid = getuid(); /* odp_app1 is in the same directory as this file: */ strncpy(prg_name, argv[0], PATH_MAX - 1); @@ -223,7 +228,7 @@ int main(int argc __attribute__((unused)), char *argv[]) /* wait max 30 sec for the fifo to be created by the ODP side. * Just die if time expire as there is no fifo to communicate * through... */ - sprintf(fifo_name, FIFO_NAME_FMT, odp_app1); + sprintf(fifo_name, FIFO_NAME_FMT, uid, odp_app1); for (nb_sec = 0; nb_sec < MAX_FIFO_WAIT; nb_sec++) { fifo_fd = open(fifo_name, O_WRONLY); if (fifo_fd >= 0) @@ -244,7 +249,7 @@ int main(int argc __attribute__((unused)), char *argv[]) &user_len, &user_flags, &align) != 0) test_failure(fifo_name, fifo_fd, odp_app1); - /* open the shm filename (which is either on /tmp or on hugetlbfs) + /* open the shm filename (which is either on /dev/shm/ or on hugetlbfs) * O_CREAT flag not given => failure if shm_devname does not already * exist */ shm_fd = open(shm_filename, O_RDONLY, diff --git a/test/linux-generic/validation/api/shmem/shmem_odp1.c b/test/linux-generic/validation/api/shmem/shmem_odp1.c index 3869c2e1..c402365a 100644 --- a/test/linux-generic/validation/api/shmem/shmem_odp1.c +++ b/test/linux-generic/validation/api/shmem/shmem_odp1.c @@ -41,7 +41,7 @@ void shmem_test_odp_shm_proc(void) /* open the fifo: this will indicate to linux process that it can * start the shmem lookups and check if it sees the data */ - sprintf(fifo_name, FIFO_NAME_FMT, getpid()); + sprintf(fifo_name, FIFO_NAME_FMT, getuid(), getpid()); CU_ASSERT_FATAL(mkfifo(fifo_name, 0666) == 0); /* read from the fifo: the linux process result: */ commit d5d52b65d262698694a5fab0b3d9bd12fa4a6460 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jun 20 12:03:39 2017 +0300 linux-gen: shm: use shm in /dev/shm instead of /tmp /tmp might be mounted to tmpfs or not mounted. If it's disk then some writes are loss there. At least ipc test shows missing packets in shm ring on 4.10.0-rc8+ kernel. Which is more likely kernel bug. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/_fdserver.c b/platform/linux-generic/_fdserver.c index 9aed7a9f..20d6e233 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/_fdserver.c @@ -58,7 +58,7 @@ #include <sys/wait.h> #define FDSERVER_SOCKPATH_MAXLEN 32 -#define FDSERVER_SOCKPATH_FORMAT "/tmp/odp-%d-fdserver" +#define FDSERVER_SOCKPATH_FORMAT "/dev/shm/odp-%d-fdserver" #define FDSERVER_BACKLOG 5 #ifndef MAP_ANONYMOUS diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index c1efd7d2..c0623f18 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -92,12 +92,13 @@ * Linux underlying file name: <directory>/odp-<odp_pid>-ishm-<name> * The <name> part may be replaced by a sequence number if no specific * name is given at reserve time - * <directory> is either /tmp or the hugepagefs mount point for default size. + * <directory> is either /dev/shm or the hugepagefs mount point for default + * size. * (searched at init time) */ #define ISHM_FILENAME_MAXLEN (ISHM_NAME_MAXLEN + 64) #define ISHM_FILENAME_FORMAT "%s/odp-%d-ishm-%s" -#define ISHM_FILENAME_NORMAL_PAGE_DIR "/tmp" +#define ISHM_FILENAME_NORMAL_PAGE_DIR "/dev/shm" /* * when the memory is to be shared with an external entity (such as another @@ -105,7 +106,7 @@ * export file is created describing the exported memory: this defines the * location and the filename format of this description file */ -#define ISHM_EXPTNAME_FORMAT "/tmp/odp-%d-shm-%s" +#define ISHM_EXPTNAME_FORMAT "/dev/shm/odp-%d-shm-%s" /* * At worse case the virtual space gets so fragmented that there is @@ -117,7 +118,7 @@ /* * when a memory block is to be exported outside its ODP instance, - * an block 'attribute file' is created in /tmp/odp-<pid>-shm-<name>. + * an block 'attribute file' is created in /dev/shm/odp-<pid>-shm-<name>. * The information given in this file is according to the following: */ #define EXPORT_FILE_LINE1_FMT "ODP exported shm block info:" @@ -401,7 +402,7 @@ static void free_fragment(ishm_fragment_t *fragmnt) /* * Create file with size len. returns -1 on error - * Creates a file to /tmp/odp-<pid>-<sequence_or_name> (for normal pages) + * Creates a file to /dev/shm/odp-<pid>-<sequence_or_name> (for normal pages) * or /mnt/huge/odp-<pid>-<sequence_or_name> (for huge pages) * Return the new file descriptor, or -1 on error. */ @@ -412,7 +413,8 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len, int fd; ishm_block_t *new_block; /* entry in the main block table */ char seq_string[ISHM_FILENAME_MAXLEN]; /* used to construct filename*/ - char filename[ISHM_FILENAME_MAXLEN];/* filename in /tmp/ or /mnt/huge */ + char filename[ISHM_FILENAME_MAXLEN]; /* filename in /dev/shm or + * /mnt/huge */ int oflag = O_RDWR | O_CREAT | O_TRUNC; /* flags for open */ FILE *export_file; @@ -530,7 +532,7 @@ static void *do_map(int block_index, uint64_t len, uint32_t align, new_block = &ishm_tbl->block[block_index]; /* - * Creates a file to /tmp/odp-<pid>-<sequence> (for normal pages) + * Creates a file to /dev/shm/odp-<pid>-<sequence> (for normal pages) * or /mnt/huge/odp-<pid>-<sequence> (for huge pages) * unless a fd was already given */ @@ -761,7 +763,7 @@ static void procsync(void) * If ok, allocate a new shared memory block and map the * provided fd in it (if fd >=0 was given). * If no fd is provided, a shared memory file desc named - * /tmp/odp-<pid>-ishm-<name_or_sequence> is created and mapped. + * /dev/shm/odp-<pid>-ishm-<name_or_sequence> is created and mapped. * (the name is different for huge page file as they must be on hugepagefs) * The function returns the index of the newly created block in the * main block table (>=0) or -1 on error. diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 06c61435..b4abb181 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -19,7 +19,7 @@ #include <errno.h> #define _ODP_FILES_FMT "odp-%d-" -#define _ODP_TMPDIR "/tmp" +#define _ODP_TMPDIR "/dev/shm" struct odp_global_data_s odp_global_data; commit 6e594990575df83dcbb70f5f86ad52f7c5a0f96d Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Sat Jun 24 00:20:43 2017 +0300 linux-gen: ipc remove base_addr_offset base_addr_offset is not used in this version, remove it. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h index 7cd29488..9d8943a6 100644 --- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h +++ b/platform/linux-generic/include/odp_packet_io_ipc_internal.h @@ -30,19 +30,11 @@ struct pktio_info { int num; /* size of packet/segment in remote pool */ uint32_t block_size; - /* offset from shared memory block start - * to pool *base_addr in remote process. - * (odp-linux pool specific) */ - size_t base_addr_offset; char pool_name[ODP_POOL_NAME_LEN]; /* 1 if master finished creation of all shared objects */ int init_done; } master; struct { - /* offset from shared memory block start - * to pool *base_addr in remote process. - * (odp-linux pool specific) */ - size_t base_addr_offset; void *base_addr; uint32_t block_size; char pool_name[ODP_POOL_NAME_LEN]; diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 6b631098..54e42227 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -59,8 +59,7 @@ static int _ipc_master_start(pktio_entry_t *pktio_entry) pktio_entry->s.ipc.remote_pool_shm = shm; pktio_entry->s.ipc.pool_base = odp_shm_addr(shm); - pktio_entry->s.ipc.pool_mdata_base = (char *)odp_shm_addr(shm) + - pinfo->slave.base_addr_offset; + pktio_entry->s.ipc.pool_mdata_base = (char *)odp_shm_addr(shm); odp_atomic_store_u32(&pktio_entry->s.ipc.ready, 1); @@ -153,7 +152,6 @@ static int _ipc_init_master(pktio_entry_t *pktio_entry, } memcpy(pinfo->master.pool_name, pool_name, strlen(pool_name)); - pinfo->slave.base_addr_offset = 0; pinfo->slave.base_addr = 0; pinfo->slave.pid = 0; pinfo->slave.init_done = 0; @@ -297,8 +295,7 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry) shm = _ipc_map_remote_pool(pinfo->master.pool_name, pid); pktio_entry->s.ipc.remote_pool_shm = shm; - pktio_entry->s.ipc.pool_mdata_base = (char *)odp_shm_addr(shm) + - pinfo->master.base_addr_offset; + pktio_entry->s.ipc.pool_mdata_base = (char *)odp_shm_addr(shm); pktio_entry->s.ipc.pkt_size = pinfo->master.block_size; _ipc_export_pool(pinfo, pktio_entry->s.ipc.pool); commit c50d47bd420c675552dd0b82638a073b67b2ae4f Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jun 20 11:37:07 2017 +0300 linux-gen: pktio: ipc: rx: push back not processed packets Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 7a054962..6b631098 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -498,12 +498,24 @@ static int ipc_pktio_recv_lockless(pktio_entry_t *pktio_entry, pkt_table[i] = pkt; } + /* put back to rx ring dequed but not processed packets*/ + if (pkts != i) { + r_p = pktio_entry->s.ipc.rx.recv; + ipcbufs_p = (void *)&offsets[i]; + pkts_ring = _ring_mp_enqueue_burst(r_p, ipcbufs_p, pkts - i); + if (pkts_ring != (pkts - i)) + ODP_ERR("bug to enqueue packets\n"); + } + + /*num of actually received packets*/ + pkts = i; + /* Now tell other process that we no longer need that buffers.*/ r_p = pktio_entry->s.ipc.rx.free; repeat: pkts_ring = _ring_mp_enqueue_burst(r_p, ipcbufs_p, pkts); - if (odp_unlikely(pkts < 0)) + if (odp_unlikely(pkts_ring < 0)) ODP_ABORT("ipc: odp_ring_mp_enqueue_bulk r_p fail\n"); if (odp_unlikely(pkts != pkts_ring)) { IPC_ODP_DBG("odp_ring_full: %d, odp_ring_count %d," commit 933fd66f5b7230a00ee0ef7acde5cc1c9af63b45 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jun 20 11:24:25 2017 +0300 linux-gen: pktio: ipc fix error check Code clean up, break before entering to for loop. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 1a2a37f2..7a054962 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -401,7 +401,7 @@ static void _ipc_free_ring_packets(pktio_entry_t *pktio_entry, _ring_t *r) while (1) { ret = _ring_mc_dequeue_burst(r, rbuf_p, PKTIO_IPC_ENTRIES); - if (0 == ret) + if (ret <= 0) break; for (i = 0; i < ret; i++) { odp_packet_hdr_t *phdr; commit 8ae6373c8844408ad080b58fb3083b30e8dc7ea6 Author: Maxim Uvarov <maxim.uvarov(a)linaro.org> Date: Tue Jun 20 11:24:25 2017 +0300 linux-gen: pktio: ipc fix send return code on tx Return number on sent packets, but not succesuful return code. Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 06175e5a..1a2a37f2 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -609,7 +609,7 @@ static int ipc_pktio_send_lockless(pktio_entry_t *pktio_entry, ODP_ABORT("Unexpected!\n"); } - return ret; + return len; } static int ipc_pktio_send(pktio_entry_t *pktio_entry, int index ODP_UNUSED, ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/_fdserver.c | 25 ++++- platform/linux-generic/_ishm.c | 124 +++++++++++++++++---- platform/linux-generic/include/_ishm_internal.h | 1 + platform/linux-generic/include/odp_internal.h | 3 + .../include/odp_packet_io_ipc_internal.h | 8 -- platform/linux-generic/odp_init.c | 66 ++--------- platform/linux-generic/pktio/ipc.c | 25 +++-- .../validation/api/shmem/shmem_common.h | 5 +- .../validation/api/shmem/shmem_linux.c | 21 +++- .../validation/api/shmem/shmem_odp1.c | 8 +- .../validation/api/shmem/shmem_odp2.c | 4 +- 11 files changed, 177 insertions(+), 113 deletions(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch api-next updated. v1.15.0.0-396-g15c97427

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 15c97427d01c81dc9f4d0aafe9b0a99cdb2d1fc6 (commit) from 00a21c6dce65a30c8250db59a42a43c658e8ca1b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 15c97427d01c81dc9f4d0aafe9b0a99cdb2d1fc6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jun 29 13:34:24 2017 +0300 linux-gen: fix out-of-tree build Drop include/odp/api/spec/deprecated.h from headers list incorrectly added by merge a5ef33a6f2575cd011cb05c3fb1b06d1c017f879. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 24f06914..92be6a73 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/cpumask.h \ $(top_srcdir)/include/odp/api/spec/crypto.h \ $(top_srcdir)/include/odp/api/spec/debug.h \ - $(top_srcdir)/include/odp/api/spec/deprecated.h \ $(top_srcdir)/include/odp/api/spec/errno.h \ $(top_srcdir)/include/odp/api/spec/event.h \ $(top_srcdir)/include/odp/api/spec/feature.h \ ----------------------------------------------------------------------- Summary of changes: platform/Makefile.inc | 1 - 1 file changed, 1 deletion(-) hooks/post-receive --

6 years, 9 months

[COMMIT] branch monarch_lts updated. v1.11.0.0_monarch-7-g0c15c40d

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, monarch_lts has been updated via 0c15c40db40834f1df217191c4b6a06303ab0872 (commit) from 0fcec77081fd1df2f862419b42014bbf700d9c32 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0c15c40db40834f1df217191c4b6a06303ab0872 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Mon Jul 3 17:08:33 2017 +0300 linux-gen: fix compilation with OpenSSL 1.1.y Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> diff --git a/platform/linux-generic/include/odp_crypto_internal.h b/platform/linux-generic/include/odp_crypto_internal.h index 7b104afa..47ace2f3 100644 --- a/platform/linux-generic/include/odp_crypto_internal.h +++ b/platform/linux-generic/include/odp_crypto_internal.h @@ -13,6 +13,7 @@ extern "C" { #include <openssl/des.h> #include <openssl/aes.h> +#include <openssl/evp.h> #define OP_RESULT_MAGIC 0x91919191 ----------------------------------------------------------------------- Summary of changes: platform/linux-generic/include/odp_crypto_internal.h | 1 + 1 file changed, 1 insertion(+) hooks/post-receive --

6 years, 9 months

[COMMIT] branch master updated. v1.15.0.0-23-g96b36df8

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 96b36df87f23bf32ab218321f1fc35703f092eb4 (commit) via 61e4b959b31854f83695cbbdd2e2fa0389fa4da6 (commit) via 6096ae389fe221d366d1a7ba8a7169c836a820de (commit) via df2cf17f3cdd3313c9982aacc7adcddfd20ea29a (commit) via fbd17f06236c14c05fb2d577b9027f96cec94a87 (commit) via e33884ef62a274c187c30f4bebb34d8a48190cfa (commit) via 0893a0d99b3b718369d77eacd88db3b7aedc8332 (commit) via 05a9cff266565a8c7d24eb29d6128f2ad70bbccb (commit) from ceeab69f3af67701adb524c7b9757d19cefb1110 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 96b36df87f23bf32ab218321f1fc35703f092eb4 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jun 29 13:07:39 2017 +0300 travis: pass proper path to make distcheck On Travis CI gems are installed into user home directory. If make distcheck is run under sudo, PATH will be reset and configure won't be able to find asciidoctor. So let's pass full user's path to make distcheck. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index f0567e59..c0a08838 100644 --- a/.travis.yml +++ b/.travis.yml @@ -209,7 +209,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example - - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make distcheck + - sudo PATH="$PATH" LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make distcheck - stage: test env: TEST=doxygen compiler: gcc commit 61e4b959b31854f83695cbbdd2e2fa0389fa4da6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:18 2017 +0300 build: enable user guides during distcheck Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/Makefile.am b/Makefile.am index fff1276a..76ceb851 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp \ --enable-test-perf \ --enable-test-perf-proc \ --enable-test-vald \ + --enable-user-guides \ --with-testdir #@with_platform@ works alone in subdir but not as part of a path??? commit 6096ae389fe221d366d1a7ba8a7169c836a820de Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:48 2017 +0300 doc: include sources of generated images into distribution Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index cce62e8d..55fe7e92 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -43,7 +43,13 @@ if HAVE_MSCGEN IMAGES += $(IMAGES_DIR)/resource_management.svg endif -EXTRA_DIST = $(SRC) $(IMAGES) +IMAGES_SRCS = \ + $(IMAGES_DIR)/pktio_fsm.gv \ + $(IMAGES_DIR)/resource_management.msc \ + $(IMAGES_DIR)/timeout_fsm.gv \ + $(IMAGES_DIR)/timer_fsm.gv + +EXTRA_DIST = $(SRC) $(IMAGES) $(IMAGES_SRCS) doc_DATA = $(TARGET) $(TARGET): $(SRC) $(IMAGES) commit df2cf17f3cdd3313c9982aacc7adcddfd20ea29a Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:42 2017 +0300 doc: drop images full paths, we have imagesdir properly set Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide-pktio.adoc b/doc/users-guide/users-guide-pktio.adoc index 9ca91f76..80a58d2f 100644 --- a/doc/users-guide/users-guide-pktio.adoc +++ b/doc/users-guide/users-guide-pktio.adoc @@ -10,7 +10,7 @@ PktIO objects are manipulated through various state transitions via `odp_pktio_xxx()` API calls as shown below: .ODP PktIO Finite State Machine -image::../images/pktio_fsm.svg[align="center"] +image::pktio_fsm.svg[align="center"] PktIOs begin in the *Unallocated* state. From here a call `odp_pktio_open()` is used to create an *odp_pktio_t* handle that is used in all subsequent calls @@ -159,7 +159,7 @@ maximum flexibility to the data plane application writer. The processing of DIRECT input is shown below: .PktIO DIRECT Mode Receive Processing -image::../images/pktin_direct_recv.svg[align="center"] +image::pktin_direct_recv.svg[align="center"] In DIRECT mode, received packets are stored in one or more special PktIO queues of type *odp_pktin_queue_t* and are retrieved by threads calling the @@ -376,7 +376,7 @@ to structure itself. A PktIO operating in DIRECT mode performs TX processing as shown here: .PktIO DIRECT Mode Transmit Processing -image::../images/pktout_direct_send.svg[align="center"] +image::pktout_direct_send.svg[align="center"] Direct TX processing operates similarly to Direct RX processing. Following open, the `odp_pktout_queue_config()` API is used to create and configure @@ -501,7 +501,7 @@ QUEUE mode uses standard ODP event queues to service packets. The processing for QUEUE input processing is shown below: .PktIO QUEUE Mode Receive Processing -image::../images/pktin_queue_recv.svg[align="center"] +image::pktin_queue_recv.svg[align="center"] In QUEUE mode, received packets are stored in one or more standard ODP queues. The difference is that these queues are not created directly by the @@ -550,7 +550,7 @@ with the PktIO. Transmit processing for PktIOs operating in QUEUE mode is shown below: .PktIO QUEUE Mode Transmit Processing -image::../images/pktout_queue_send.svg[align="center] +image::pktout_queue_send.svg[align="center] For TX processing QUEUE mode behaves similar to DIRECT mode except that output queues are regular ODP event queues that receive packets via @@ -578,7 +578,7 @@ input queues created by a subsequent `odp_pktin_queue_config()` call are to be used as input to the *ODP Scheduler*. .PktIO SCHED Mode Receive Processing -image::../images/pktin_sched_recv.svg[align="center'] +image::pktin_sched_recv.svg[align="center'] For basic use, SCHED mode simply associates the PktIO input event queues created by `odp_pktin_queue_config()` with the scheduler. Hashing may still be @@ -593,7 +593,7 @@ In its fullest form, PktIOs operating in SCHED mode use the *ODP Classifier* to permit fine-grained flow separation on *Class of Service (CoS)* boundaries. .PktIO SCHED Mode Receive Processing with Classification -image::../images/pktin_sched_cls.svg[align="center"] +image::pktin_sched_cls.svg[align="center"] In this mode of operation, the hash function of `odp_pktin_queue_config()` is typically not used. Instead, the event queues created by this call, diff --git a/doc/users-guide/users-guide-tm.adoc b/doc/users-guide/users-guide-tm.adoc index 36fa9ece..25129733 100644 --- a/doc/users-guide/users-guide-tm.adoc +++ b/doc/users-guide/users-guide-tm.adoc @@ -162,7 +162,7 @@ into one fan-in of a subsequent tm_node or egresss object - forming a proper tree. .Hierarchical Scheduling -image::../images/tm_hierarchy.svg[align="center"] +image::tm_hierarchy.svg[align="center"] Multi-level/hierarchical scheduling adds both great control and significant complexity. Logically, despite the implication of the tm_node tree diagrams, @@ -183,7 +183,7 @@ some very sophisticated behaviours. Each tm_node can contain a set of scheduler shaper and a WRED component - or a subset of these. .Traffic Manager Node -image::../images/tm_node.svg[align="center"] +image::tm_node.svg[align="center"] In its full generality an tm_node consists of a set of "fan-in" connections to preceding tm_queues or tm_nodes. The fan-in for a single tm_node can range commit fbd17f06236c14c05fb2d577b9027f96cec94a87 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:36 2017 +0300 doc: fix user-guide.doc permissions Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc old mode 100755 new mode 100644 commit e33884ef62a274c187c30f4bebb34d8a48190cfa Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:32 2017 +0300 doc: use CLEANFILES instead of handcoding clean rules Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 2d48d840..07ee141c 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -8,5 +8,4 @@ EXTRA_DIST = $(SRC) doc_DATA = $(TARGET) $(TARGET): $(SRC) -clean-local: - rm -f $(builddir)/$(TARGET) +CLEANFILES = $(doc_DATA) diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index 6db7c867..5c2afb8c 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -13,19 +13,6 @@ EXTRA_DIST = bylaws-guide.adoc \ $(top_srcdir)/CONTRIBUTING \ $(IMAGES) -all-local: bylaws-guide.html \ - release-guide.html \ - faq.html \ - CONTRIBUTING.html \ - CHANGELOG.html - -clean-local: - rm -f $(builddir)/bylaws-guide.html - rm -f $(builddir)/release-guide.html - rm -f $(builddir)/faq.html - rm -f $(builddir)/CONTRIBUTING.html - rm -f $(builddir)/CHANGELOG.html - release-guide.html: release-guide.adoc \ $(IMAGES_DIR)/simple_release_git.svg \ $(IMAGES_DIR)/release_git.svg @@ -45,3 +32,5 @@ CHANGELOG.html: $(top_srcdir)/CHANGELOG #add deps on images doc_DATA = bylaws-guide.html release-guide.html CONTRIBUTING.html faq.html CHANGELOG.html + +CLEANFILES = $(doc_DATA) diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 871e2eab..cce62e8d 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -48,5 +48,4 @@ EXTRA_DIST = $(SRC) $(IMAGES) doc_DATA = $(TARGET) $(TARGET): $(SRC) $(IMAGES) -clean-local: - rm -f $(builddir)/$(TARGET) +CLEANFILES = $(doc_DATA) commit 0893a0d99b3b718369d77eacd88db3b7aedc8332 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:28 2017 +0300 doc: fix documentation building Set VPATH to just $(srcdir) so that make can locate adoc files itself. Drop long paths starting from $(top_srcdir), which are unnecessary now. Properly declare SUFFIXES used in documentation building (so that automake can pass that to make to enable proper rules substitution). Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/Makefile.am b/doc/Makefile.am index 59d6a6c6..c6124f46 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,7 +9,7 @@ SUBDIRS += implementers-guide users-guide process-guide endif EXTRA_DIST = \ - $(top_srcdir)/doc/doxygenlayout.xml \ - $(top_srcdir)/doc/odpdoxygen.css \ - $(top_srcdir)/doc/glossary.adoc \ - $(top_srcdir)/doc/Doxyfile_common + doxygenlayout.xml \ + odpdoxygen.css \ + glossary.adoc \ + Doxyfile_common diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 4a1acf98..23703127 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -1,6 +1,8 @@ IMAGES_DIR = $(top_srcdir)/doc/images -VPATH=$(top_builddir)/doc/images +VPATH = $(srcdir) + +SUFFIXES = .svg .msc .gv .html .adoc .msc.svg: mscgen -T svg -i $^ -o $@ diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 4bdb970e..2d48d840 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -SRC = $(top_srcdir)/doc/implementers-guide/implementers-guide.adoc +SRC = implementers-guide.adoc TARGET = implementers-guide.html EXTRA_DIST = $(SRC) diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index da8bb0ae..6db7c867 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -7,9 +7,9 @@ IMAGES = $(IMAGES_DIR)/aboutODP1.svg \ $(IMAGES_DIR)/aboutODP5.svg \ $(IMAGES_DIR)/overview.svg -EXTRA_DIST = $(top_srcdir)/doc/process-guide/bylaws-guide.adoc \ - $(top_srcdir)/doc/process-guide/release-guide.adoc \ - $(top_srcdir)/doc/process-guide/faq.adoc \ +EXTRA_DIST = bylaws-guide.adoc \ + release-guide.adoc \ + faq.adoc \ $(top_srcdir)/CONTRIBUTING \ $(IMAGES) @@ -26,13 +26,13 @@ clean-local: rm -f $(builddir)/CONTRIBUTING.html rm -f $(builddir)/CHANGELOG.html -release-guide.html: $(top_srcdir)/doc/process-guide/release-guide.adoc \ +release-guide.html: release-guide.adoc \ $(IMAGES_DIR)/simple_release_git.svg \ $(IMAGES_DIR)/release_git.svg -bylaws-guide.html: $(top_srcdir)/doc/process-guide/bylaws-guide.adoc +bylaws-guide.html: bylaws-guide.adoc -faq.html: $(top_srcdir)/doc/process-guide/faq.adoc \ +faq.html: faq.adoc \ $(IMAGES) #special case is not postfixed .adoc diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index ae718268..871e2eab 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -1,12 +1,12 @@ include ../Makefile.inc -SRC = $(top_srcdir)/doc/users-guide/users-guide.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-cls.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-crypto.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-packet.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-pktio.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-timer.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-tm.adoc +SRC = users-guide.adoc \ + users-guide-cls.adoc \ + users-guide-crypto.adoc \ + users-guide-packet.adoc \ + users-guide-pktio.adoc \ + users-guide-timer.adoc \ + users-guide-tm.adoc TARGET = users-guide.html IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/atomic_queue.svg \ @@ -50,5 +50,3 @@ $(TARGET): $(SRC) $(IMAGES) clean-local: rm -f $(builddir)/$(TARGET) - -$(SRC): $(IMAGES) commit 05a9cff266565a8c7d24eb29d6128f2ad70bbccb Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:23 2017 +0300 doc: add IMAGES_DIR instead of specifying full path to images Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 643b1d4e..4a1acf98 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -1,3 +1,5 @@ +IMAGES_DIR = $(top_srcdir)/doc/images + VPATH=$(top_builddir)/doc/images .msc.svg: diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index 1abaf7e4..da8bb0ae 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -1,11 +1,11 @@ include ../Makefile.inc -IMAGES = $(top_srcdir)/doc/images/aboutODP1.svg \ - $(top_srcdir)/doc/images/aboutODP2.svg \ - $(top_srcdir)/doc/images/aboutODP3.svg \ - $(top_srcdir)/doc/images/packet_flow.svg \ - $(top_srcdir)/doc/images/aboutODP5.svg \ - $(top_srcdir)/doc/images/overview.svg +IMAGES = $(IMAGES_DIR)/aboutODP1.svg \ + $(IMAGES_DIR)/aboutODP2.svg \ + $(IMAGES_DIR)/aboutODP3.svg \ + $(IMAGES_DIR)/packet_flow.svg \ + $(IMAGES_DIR)/aboutODP5.svg \ + $(IMAGES_DIR)/overview.svg EXTRA_DIST = $(top_srcdir)/doc/process-guide/bylaws-guide.adoc \ $(top_srcdir)/doc/process-guide/release-guide.adoc \ @@ -27,8 +27,8 @@ clean-local: rm -f $(builddir)/CHANGELOG.html release-guide.html: $(top_srcdir)/doc/process-guide/release-guide.adoc \ - $(top_srcdir)/doc/images/simple_release_git.svg \ - $(top_srcdir)/doc/images/release_git.svg + $(IMAGES_DIR)/simple_release_git.svg \ + $(IMAGES_DIR)/release_git.svg bylaws-guide.html: $(top_srcdir)/doc/process-guide/bylaws-guide.adoc diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 01b4df36..ae718268 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -8,39 +8,39 @@ SRC = $(top_srcdir)/doc/users-guide/users-guide.adoc \ $(top_srcdir)/doc/users-guide/users-guide-timer.adoc \ $(top_srcdir)/doc/users-guide/users-guide-tm.adoc TARGET = users-guide.html -IMAGES = $(top_srcdir)/doc/images/overview.svg \ - $(top_srcdir)/doc/images/atomic_queue.svg \ - $(top_srcdir)/doc/images/odp_components.svg \ - $(top_srcdir)/doc/images/ODP-Logo-HQ.svg \ - $(top_srcdir)/doc/images/odp_rx_processing.svg \ - $(top_srcdir)/doc/images/odp_scheduling.svg \ - $(top_srcdir)/doc/images/odp_traffic_manager.svg \ - $(top_srcdir)/doc/images/ordered_queue.svg \ - $(top_srcdir)/doc/images/packet_flow.svg \ - $(top_srcdir)/doc/images/packet-adddata.svg \ - $(top_srcdir)/doc/images/packet-align.svg \ - $(top_srcdir)/doc/images/packet-copyops.svg \ - $(top_srcdir)/doc/images/packet-remdata.svg \ - $(top_srcdir)/doc/images/packet-split.svg \ - $(top_srcdir)/doc/images/packet.svg \ - $(top_srcdir)/doc/images/parallel_queue.svg \ - $(top_srcdir)/doc/images/pktin_direct_recv.svg \ - $(top_srcdir)/doc/images/pktin_queue_recv.svg \ - $(top_srcdir)/doc/images/pktin_sched_recv.svg \ - $(top_srcdir)/doc/images/pktio_fsm.svg \ - $(top_srcdir)/doc/images/pktout_direct_send.svg \ - $(top_srcdir)/doc/images/pktout_queue_send.svg \ - $(top_srcdir)/doc/images/release_git.svg \ - $(top_srcdir)/doc/images/segment.svg \ - $(top_srcdir)/doc/images/simple_release_git.svg \ - $(top_srcdir)/doc/images/timeout_fsm.svg \ - $(top_srcdir)/doc/images/timer_fsm.svg \ - $(top_srcdir)/doc/images/tm_hierarchy.svg \ - $(top_srcdir)/doc/images/tm_node.svg \ - $(top_srcdir)/doc/images/pktin_sched_cls.svg +IMAGES = $(IMAGES_DIR)/overview.svg \ + $(IMAGES_DIR)/atomic_queue.svg \ + $(IMAGES_DIR)/odp_components.svg \ + $(IMAGES_DIR)/ODP-Logo-HQ.svg \ + $(IMAGES_DIR)/odp_rx_processing.svg \ + $(IMAGES_DIR)/odp_scheduling.svg \ + $(IMAGES_DIR)/odp_traffic_manager.svg \ + $(IMAGES_DIR)/ordered_queue.svg \ + $(IMAGES_DIR)/packet_flow.svg \ + $(IMAGES_DIR)/packet-adddata.svg \ + $(IMAGES_DIR)/packet-align.svg \ + $(IMAGES_DIR)/packet-copyops.svg \ + $(IMAGES_DIR)/packet-remdata.svg \ + $(IMAGES_DIR)/packet-split.svg \ + $(IMAGES_DIR)/packet.svg \ + $(IMAGES_DIR)/parallel_queue.svg \ + $(IMAGES_DIR)/pktin_direct_recv.svg \ + $(IMAGES_DIR)/pktin_queue_recv.svg \ + $(IMAGES_DIR)/pktin_sched_recv.svg \ + $(IMAGES_DIR)/pktio_fsm.svg \ + $(IMAGES_DIR)/pktout_direct_send.svg \ + $(IMAGES_DIR)/pktout_queue_send.svg \ + $(IMAGES_DIR)/release_git.svg \ + $(IMAGES_DIR)/segment.svg \ + $(IMAGES_DIR)/simple_release_git.svg \ + $(IMAGES_DIR)/timeout_fsm.svg \ + $(IMAGES_DIR)/timer_fsm.svg \ + $(IMAGES_DIR)/tm_hierarchy.svg \ + $(IMAGES_DIR)/tm_node.svg \ + $(IMAGES_DIR)/pktin_sched_cls.svg if HAVE_MSCGEN -IMAGES += $(top_srcdir)/doc/images/resource_management.svg +IMAGES += $(IMAGES_DIR)/resource_management.svg endif EXTRA_DIST = $(SRC) $(IMAGES) ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- Makefile.am | 1 + doc/Makefile.am | 8 +-- doc/Makefile.inc | 6 ++- doc/implementers-guide/Makefile.am | 5 +- doc/process-guide/Makefile.am | 45 +++++++---------- doc/users-guide/Makefile.am | 89 ++++++++++++++++++---------------- doc/users-guide/users-guide-pktio.adoc | 14 +++--- doc/users-guide/users-guide-tm.adoc | 4 +- doc/users-guide/users-guide.adoc | 0 10 files changed, 85 insertions(+), 89 deletions(-) mode change 100755 => 100644 doc/users-guide/users-guide.adoc hooks/post-receive --

6 years, 9 months

[COMMIT] branch api-next updated. v1.15.0.0-395-g00a21c6d

by git＠git-us.linaro.org

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, api-next has been updated via 00a21c6dce65a30c8250db59a42a43c658e8ca1b (commit) via 08463cdedd4ab64ea94dbf90c7417bf403bf7aaa (commit) via 500cb603d5e1cb4926986242ad51d995b494c2e8 (commit) via dd394c9d9a88161e157317fa8a6eba92cb6f2e01 (commit) via 60ad22e8bd7624432e9504d32309c691fedcf27f (commit) via 4a38c7c61a370007bea53f9bb36279ce3ba42233 (commit) via e91a24138eec9054fc083174e3d071269dc1e4b6 (commit) via 3687001250f4b50af8c2f9d9aa61d3ee99976a1e (commit) from 7a5813042d58598e1c66243d8cfed548302edfc4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 00a21c6dce65a30c8250db59a42a43c658e8ca1b Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Thu Jun 29 13:07:39 2017 +0300 travis: pass proper path to make distcheck On Travis CI gems are installed into user home directory. If make distcheck is run under sudo, PATH will be reset and configure won't be able to find asciidoctor. So let's pass full user's path to make distcheck. Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/.travis.yml b/.travis.yml index 7304e0ef..35d34581 100644 --- a/.travis.yml +++ b/.travis.yml @@ -140,7 +140,7 @@ jobs: script: - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-test-cpp --enable-test-vald --enable-test-helper --enable-test-perf --enable-user-guides --enable-test-perf-proc --enable-test-example - - sudo LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make distcheck + - sudo PATH="$PATH" LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" make distcheck - stage: test env: TEST=doxygen compiler: gcc commit 08463cdedd4ab64ea94dbf90c7417bf403bf7aaa Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:18 2017 +0300 build: enable user guides during distcheck Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/Makefile.am b/Makefile.am index fff1276a..76ceb851 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp \ --enable-test-perf \ --enable-test-perf-proc \ --enable-test-vald \ + --enable-user-guides \ --with-testdir #@with_platform@ works alone in subdir but not as part of a path??? commit 500cb603d5e1cb4926986242ad51d995b494c2e8 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:48 2017 +0300 doc: include sources of generated images into distribution Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index cce62e8d..55fe7e92 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -43,7 +43,13 @@ if HAVE_MSCGEN IMAGES += $(IMAGES_DIR)/resource_management.svg endif -EXTRA_DIST = $(SRC) $(IMAGES) +IMAGES_SRCS = \ + $(IMAGES_DIR)/pktio_fsm.gv \ + $(IMAGES_DIR)/resource_management.msc \ + $(IMAGES_DIR)/timeout_fsm.gv \ + $(IMAGES_DIR)/timer_fsm.gv + +EXTRA_DIST = $(SRC) $(IMAGES) $(IMAGES_SRCS) doc_DATA = $(TARGET) $(TARGET): $(SRC) $(IMAGES) commit dd394c9d9a88161e157317fa8a6eba92cb6f2e01 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:42 2017 +0300 doc: drop images full paths, we have imagesdir properly set Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide-pktio.adoc b/doc/users-guide/users-guide-pktio.adoc index 9ca91f76..80a58d2f 100644 --- a/doc/users-guide/users-guide-pktio.adoc +++ b/doc/users-guide/users-guide-pktio.adoc @@ -10,7 +10,7 @@ PktIO objects are manipulated through various state transitions via `odp_pktio_xxx()` API calls as shown below: .ODP PktIO Finite State Machine -image::../images/pktio_fsm.svg[align="center"] +image::pktio_fsm.svg[align="center"] PktIOs begin in the *Unallocated* state. From here a call `odp_pktio_open()` is used to create an *odp_pktio_t* handle that is used in all subsequent calls @@ -159,7 +159,7 @@ maximum flexibility to the data plane application writer. The processing of DIRECT input is shown below: .PktIO DIRECT Mode Receive Processing -image::../images/pktin_direct_recv.svg[align="center"] +image::pktin_direct_recv.svg[align="center"] In DIRECT mode, received packets are stored in one or more special PktIO queues of type *odp_pktin_queue_t* and are retrieved by threads calling the @@ -376,7 +376,7 @@ to structure itself. A PktIO operating in DIRECT mode performs TX processing as shown here: .PktIO DIRECT Mode Transmit Processing -image::../images/pktout_direct_send.svg[align="center"] +image::pktout_direct_send.svg[align="center"] Direct TX processing operates similarly to Direct RX processing. Following open, the `odp_pktout_queue_config()` API is used to create and configure @@ -501,7 +501,7 @@ QUEUE mode uses standard ODP event queues to service packets. The processing for QUEUE input processing is shown below: .PktIO QUEUE Mode Receive Processing -image::../images/pktin_queue_recv.svg[align="center"] +image::pktin_queue_recv.svg[align="center"] In QUEUE mode, received packets are stored in one or more standard ODP queues. The difference is that these queues are not created directly by the @@ -550,7 +550,7 @@ with the PktIO. Transmit processing for PktIOs operating in QUEUE mode is shown below: .PktIO QUEUE Mode Transmit Processing -image::../images/pktout_queue_send.svg[align="center] +image::pktout_queue_send.svg[align="center] For TX processing QUEUE mode behaves similar to DIRECT mode except that output queues are regular ODP event queues that receive packets via @@ -578,7 +578,7 @@ input queues created by a subsequent `odp_pktin_queue_config()` call are to be used as input to the *ODP Scheduler*. .PktIO SCHED Mode Receive Processing -image::../images/pktin_sched_recv.svg[align="center'] +image::pktin_sched_recv.svg[align="center'] For basic use, SCHED mode simply associates the PktIO input event queues created by `odp_pktin_queue_config()` with the scheduler. Hashing may still be @@ -593,7 +593,7 @@ In its fullest form, PktIOs operating in SCHED mode use the *ODP Classifier* to permit fine-grained flow separation on *Class of Service (CoS)* boundaries. .PktIO SCHED Mode Receive Processing with Classification -image::../images/pktin_sched_cls.svg[align="center"] +image::pktin_sched_cls.svg[align="center"] In this mode of operation, the hash function of `odp_pktin_queue_config()` is typically not used. Instead, the event queues created by this call, diff --git a/doc/users-guide/users-guide-tm.adoc b/doc/users-guide/users-guide-tm.adoc index 36fa9ece..25129733 100644 --- a/doc/users-guide/users-guide-tm.adoc +++ b/doc/users-guide/users-guide-tm.adoc @@ -162,7 +162,7 @@ into one fan-in of a subsequent tm_node or egresss object - forming a proper tree. .Hierarchical Scheduling -image::../images/tm_hierarchy.svg[align="center"] +image::tm_hierarchy.svg[align="center"] Multi-level/hierarchical scheduling adds both great control and significant complexity. Logically, despite the implication of the tm_node tree diagrams, @@ -183,7 +183,7 @@ some very sophisticated behaviours. Each tm_node can contain a set of scheduler shaper and a WRED component - or a subset of these. .Traffic Manager Node -image::../images/tm_node.svg[align="center"] +image::tm_node.svg[align="center"] In its full generality an tm_node consists of a set of "fan-in" connections to preceding tm_queues or tm_nodes. The fan-in for a single tm_node can range commit 60ad22e8bd7624432e9504d32309c691fedcf27f Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:36 2017 +0300 doc: fix user-guide.doc permissions Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/users-guide/users-guide.adoc b/doc/users-guide/users-guide.adoc old mode 100755 new mode 100644 commit 4a38c7c61a370007bea53f9bb36279ce3ba42233 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:32 2017 +0300 doc: use CLEANFILES instead of handcoding clean rules Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 2d48d840..07ee141c 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -8,5 +8,4 @@ EXTRA_DIST = $(SRC) doc_DATA = $(TARGET) $(TARGET): $(SRC) -clean-local: - rm -f $(builddir)/$(TARGET) +CLEANFILES = $(doc_DATA) diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index 6db7c867..5c2afb8c 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -13,19 +13,6 @@ EXTRA_DIST = bylaws-guide.adoc \ $(top_srcdir)/CONTRIBUTING \ $(IMAGES) -all-local: bylaws-guide.html \ - release-guide.html \ - faq.html \ - CONTRIBUTING.html \ - CHANGELOG.html - -clean-local: - rm -f $(builddir)/bylaws-guide.html - rm -f $(builddir)/release-guide.html - rm -f $(builddir)/faq.html - rm -f $(builddir)/CONTRIBUTING.html - rm -f $(builddir)/CHANGELOG.html - release-guide.html: release-guide.adoc \ $(IMAGES_DIR)/simple_release_git.svg \ $(IMAGES_DIR)/release_git.svg @@ -45,3 +32,5 @@ CHANGELOG.html: $(top_srcdir)/CHANGELOG #add deps on images doc_DATA = bylaws-guide.html release-guide.html CONTRIBUTING.html faq.html CHANGELOG.html + +CLEANFILES = $(doc_DATA) diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 871e2eab..cce62e8d 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -48,5 +48,4 @@ EXTRA_DIST = $(SRC) $(IMAGES) doc_DATA = $(TARGET) $(TARGET): $(SRC) $(IMAGES) -clean-local: - rm -f $(builddir)/$(TARGET) +CLEANFILES = $(doc_DATA) commit e91a24138eec9054fc083174e3d071269dc1e4b6 Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:28 2017 +0300 doc: fix documentation building Set VPATH to just $(srcdir) so that make can locate adoc files itself. Drop long paths starting from $(top_srcdir), which are unnecessary now. Properly declare SUFFIXES used in documentation building (so that automake can pass that to make to enable proper rules substitution). Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/Makefile.am b/doc/Makefile.am index 59d6a6c6..c6124f46 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,7 +9,7 @@ SUBDIRS += implementers-guide users-guide process-guide endif EXTRA_DIST = \ - $(top_srcdir)/doc/doxygenlayout.xml \ - $(top_srcdir)/doc/odpdoxygen.css \ - $(top_srcdir)/doc/glossary.adoc \ - $(top_srcdir)/doc/Doxyfile_common + doxygenlayout.xml \ + odpdoxygen.css \ + glossary.adoc \ + Doxyfile_common diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 4a1acf98..23703127 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -1,6 +1,8 @@ IMAGES_DIR = $(top_srcdir)/doc/images -VPATH=$(top_builddir)/doc/images +VPATH = $(srcdir) + +SUFFIXES = .svg .msc .gv .html .adoc .msc.svg: mscgen -T svg -i $^ -o $@ diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 4bdb970e..2d48d840 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -1,6 +1,6 @@ include ../Makefile.inc -SRC = $(top_srcdir)/doc/implementers-guide/implementers-guide.adoc +SRC = implementers-guide.adoc TARGET = implementers-guide.html EXTRA_DIST = $(SRC) diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index da8bb0ae..6db7c867 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -7,9 +7,9 @@ IMAGES = $(IMAGES_DIR)/aboutODP1.svg \ $(IMAGES_DIR)/aboutODP5.svg \ $(IMAGES_DIR)/overview.svg -EXTRA_DIST = $(top_srcdir)/doc/process-guide/bylaws-guide.adoc \ - $(top_srcdir)/doc/process-guide/release-guide.adoc \ - $(top_srcdir)/doc/process-guide/faq.adoc \ +EXTRA_DIST = bylaws-guide.adoc \ + release-guide.adoc \ + faq.adoc \ $(top_srcdir)/CONTRIBUTING \ $(IMAGES) @@ -26,13 +26,13 @@ clean-local: rm -f $(builddir)/CONTRIBUTING.html rm -f $(builddir)/CHANGELOG.html -release-guide.html: $(top_srcdir)/doc/process-guide/release-guide.adoc \ +release-guide.html: release-guide.adoc \ $(IMAGES_DIR)/simple_release_git.svg \ $(IMAGES_DIR)/release_git.svg -bylaws-guide.html: $(top_srcdir)/doc/process-guide/bylaws-guide.adoc +bylaws-guide.html: bylaws-guide.adoc -faq.html: $(top_srcdir)/doc/process-guide/faq.adoc \ +faq.html: faq.adoc \ $(IMAGES) #special case is not postfixed .adoc diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index ae718268..871e2eab 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -1,12 +1,12 @@ include ../Makefile.inc -SRC = $(top_srcdir)/doc/users-guide/users-guide.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-cls.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-crypto.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-packet.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-pktio.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-timer.adoc \ - $(top_srcdir)/doc/users-guide/users-guide-tm.adoc +SRC = users-guide.adoc \ + users-guide-cls.adoc \ + users-guide-crypto.adoc \ + users-guide-packet.adoc \ + users-guide-pktio.adoc \ + users-guide-timer.adoc \ + users-guide-tm.adoc TARGET = users-guide.html IMAGES = $(IMAGES_DIR)/overview.svg \ $(IMAGES_DIR)/atomic_queue.svg \ @@ -50,5 +50,3 @@ $(TARGET): $(SRC) $(IMAGES) clean-local: rm -f $(builddir)/$(TARGET) - -$(SRC): $(IMAGES) commit 3687001250f4b50af8c2f9d9aa61d3ee99976a1e Author: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Date: Wed Jun 28 14:25:23 2017 +0300 doc: add IMAGES_DIR instead of specifying full path to images Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov(a)linaro.org> Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 643b1d4e..4a1acf98 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -1,3 +1,5 @@ +IMAGES_DIR = $(top_srcdir)/doc/images + VPATH=$(top_builddir)/doc/images .msc.svg: diff --git a/doc/process-guide/Makefile.am b/doc/process-guide/Makefile.am index 1abaf7e4..da8bb0ae 100644 --- a/doc/process-guide/Makefile.am +++ b/doc/process-guide/Makefile.am @@ -1,11 +1,11 @@ include ../Makefile.inc -IMAGES = $(top_srcdir)/doc/images/aboutODP1.svg \ - $(top_srcdir)/doc/images/aboutODP2.svg \ - $(top_srcdir)/doc/images/aboutODP3.svg \ - $(top_srcdir)/doc/images/packet_flow.svg \ - $(top_srcdir)/doc/images/aboutODP5.svg \ - $(top_srcdir)/doc/images/overview.svg +IMAGES = $(IMAGES_DIR)/aboutODP1.svg \ + $(IMAGES_DIR)/aboutODP2.svg \ + $(IMAGES_DIR)/aboutODP3.svg \ + $(IMAGES_DIR)/packet_flow.svg \ + $(IMAGES_DIR)/aboutODP5.svg \ + $(IMAGES_DIR)/overview.svg EXTRA_DIST = $(top_srcdir)/doc/process-guide/bylaws-guide.adoc \ $(top_srcdir)/doc/process-guide/release-guide.adoc \ @@ -27,8 +27,8 @@ clean-local: rm -f $(builddir)/CHANGELOG.html release-guide.html: $(top_srcdir)/doc/process-guide/release-guide.adoc \ - $(top_srcdir)/doc/images/simple_release_git.svg \ - $(top_srcdir)/doc/images/release_git.svg + $(IMAGES_DIR)/simple_release_git.svg \ + $(IMAGES_DIR)/release_git.svg bylaws-guide.html: $(top_srcdir)/doc/process-guide/bylaws-guide.adoc diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 01b4df36..ae718268 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -8,39 +8,39 @@ SRC = $(top_srcdir)/doc/users-guide/users-guide.adoc \ $(top_srcdir)/doc/users-guide/users-guide-timer.adoc \ $(top_srcdir)/doc/users-guide/users-guide-tm.adoc TARGET = users-guide.html -IMAGES = $(top_srcdir)/doc/images/overview.svg \ - $(top_srcdir)/doc/images/atomic_queue.svg \ - $(top_srcdir)/doc/images/odp_components.svg \ - $(top_srcdir)/doc/images/ODP-Logo-HQ.svg \ - $(top_srcdir)/doc/images/odp_rx_processing.svg \ - $(top_srcdir)/doc/images/odp_scheduling.svg \ - $(top_srcdir)/doc/images/odp_traffic_manager.svg \ - $(top_srcdir)/doc/images/ordered_queue.svg \ - $(top_srcdir)/doc/images/packet_flow.svg \ - $(top_srcdir)/doc/images/packet-adddata.svg \ - $(top_srcdir)/doc/images/packet-align.svg \ - $(top_srcdir)/doc/images/packet-copyops.svg \ - $(top_srcdir)/doc/images/packet-remdata.svg \ - $(top_srcdir)/doc/images/packet-split.svg \ - $(top_srcdir)/doc/images/packet.svg \ - $(top_srcdir)/doc/images/parallel_queue.svg \ - $(top_srcdir)/doc/images/pktin_direct_recv.svg \ - $(top_srcdir)/doc/images/pktin_queue_recv.svg \ - $(top_srcdir)/doc/images/pktin_sched_recv.svg \ - $(top_srcdir)/doc/images/pktio_fsm.svg \ - $(top_srcdir)/doc/images/pktout_direct_send.svg \ - $(top_srcdir)/doc/images/pktout_queue_send.svg \ - $(top_srcdir)/doc/images/release_git.svg \ - $(top_srcdir)/doc/images/segment.svg \ - $(top_srcdir)/doc/images/simple_release_git.svg \ - $(top_srcdir)/doc/images/timeout_fsm.svg \ - $(top_srcdir)/doc/images/timer_fsm.svg \ - $(top_srcdir)/doc/images/tm_hierarchy.svg \ - $(top_srcdir)/doc/images/tm_node.svg \ - $(top_srcdir)/doc/images/pktin_sched_cls.svg +IMAGES = $(IMAGES_DIR)/overview.svg \ + $(IMAGES_DIR)/atomic_queue.svg \ + $(IMAGES_DIR)/odp_components.svg \ + $(IMAGES_DIR)/ODP-Logo-HQ.svg \ + $(IMAGES_DIR)/odp_rx_processing.svg \ + $(IMAGES_DIR)/odp_scheduling.svg \ + $(IMAGES_DIR)/odp_traffic_manager.svg \ + $(IMAGES_DIR)/ordered_queue.svg \ + $(IMAGES_DIR)/packet_flow.svg \ + $(IMAGES_DIR)/packet-adddata.svg \ + $(IMAGES_DIR)/packet-align.svg \ + $(IMAGES_DIR)/packet-copyops.svg \ + $(IMAGES_DIR)/packet-remdata.svg \ + $(IMAGES_DIR)/packet-split.svg \ + $(IMAGES_DIR)/packet.svg \ + $(IMAGES_DIR)/parallel_queue.svg \ + $(IMAGES_DIR)/pktin_direct_recv.svg \ + $(IMAGES_DIR)/pktin_queue_recv.svg \ + $(IMAGES_DIR)/pktin_sched_recv.svg \ + $(IMAGES_DIR)/pktio_fsm.svg \ + $(IMAGES_DIR)/pktout_direct_send.svg \ + $(IMAGES_DIR)/pktout_queue_send.svg \ + $(IMAGES_DIR)/release_git.svg \ + $(IMAGES_DIR)/segment.svg \ + $(IMAGES_DIR)/simple_release_git.svg \ + $(IMAGES_DIR)/timeout_fsm.svg \ + $(IMAGES_DIR)/timer_fsm.svg \ + $(IMAGES_DIR)/tm_hierarchy.svg \ + $(IMAGES_DIR)/tm_node.svg \ + $(IMAGES_DIR)/pktin_sched_cls.svg if HAVE_MSCGEN -IMAGES += $(top_srcdir)/doc/images/resource_management.svg +IMAGES += $(IMAGES_DIR)/resource_management.svg endif EXTRA_DIST = $(SRC) $(IMAGES) ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- Makefile.am | 1 + doc/Makefile.am | 8 +-- doc/Makefile.inc | 6 ++- doc/implementers-guide/Makefile.am | 5 +- doc/process-guide/Makefile.am | 45 +++++++---------- doc/users-guide/Makefile.am | 89 ++++++++++++++++++---------------- doc/users-guide/users-guide-pktio.adoc | 14 +++--- doc/users-guide/users-guide-tm.adoc | 4 +- doc/users-guide/users-guide.adoc | 0 10 files changed, 85 insertions(+), 89 deletions(-) mode change 100755 => 100644 doc/users-guide/users-guide.adoc hooks/post-receive --

6 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

git-lng-odp July 2017