summaryrefslogtreecommitdiffstats
path: root/pcitool
diff options
context:
space:
mode:
authorzilio nicolas <nicolas.zilio@kit.edu>2015-07-07 11:12:52 +0200
committerzilio nicolas <nicolas.zilio@kit.edu>2015-07-07 11:12:52 +0200
commitf923add0a9b6bd17d43f72c21eec4e01e19240cf (patch)
tree8f737e8bd5faa360dfef5b33c52a0f58679c4b8d /pcitool
parente2515f6e1a7b17addda4c558a0a6ca05b4ec6e55 (diff)
downloadpcitool-f923add0a9b6bd17d43f72c21eec4e01e19240cf.tar.gz
pcitool-f923add0a9b6bd17d43f72c21eec4e01e19240cf.tar.bz2
pcitool-f923add0a9b6bd17d43f72c21eec4e01e19240cf.tar.xz
pcitool-f923add0a9b6bd17d43f72c21eec4e01e19240cf.zip
clean version for locks
Diffstat (limited to 'pcitool')
-rw-r--r--pcitool/cli.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/pcitool/cli.c b/pcitool/cli.c
index 9eeb046..a6224e3 100644
--- a/pcitool/cli.c
+++ b/pcitool/cli.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 700
#define _POSIX_C_SOURCE 200112L
#define _BSD_SOURCE
@@ -37,6 +38,7 @@
#include "error.h"
#include "debug.h"
#include "model.h"
+#include "locking.h"
/* defines */
#define MAX_KBUF 14
@@ -89,7 +91,8 @@ typedef enum {
MODE_ALLOC_KMEM,
MODE_LIST_KMEM,
MODE_READ_KMEM,
- MODE_FREE_KMEM
+ MODE_FREE_KMEM,
+ MODE_FREE_LOCKS
} MODE;
typedef enum {
@@ -167,7 +170,8 @@ typedef enum {
OPT_VERIFY,
OPT_WAIT,
OPT_MULTIPACKET,
- OPT_VERBOSE
+ OPT_VERBOSE,
+ OPT_FREE_LOCKS
} OPTIONS;
static struct option long_options[] = {
@@ -219,6 +223,7 @@ static struct option long_options[] = {
{"multipacket", no_argument, 0, OPT_MULTIPACKET },
{"wait", no_argument, 0, OPT_WAIT },
{"help", no_argument, 0, OPT_HELP },
+ {"free-locks", no_argument, 0, OPT_FREE_LOCKS},
{ 0, 0, 0, 0 }
};
@@ -272,6 +277,7 @@ void Usage(int argc, char *argv[], const char *format, ...) {
" block is specified as: use:block_number\n"
" --alloc-kernel-memory <use> - Allocate kernel buffers (DANGEROUS)\n"
" --free-kernel-memory <use> - Cleans lost kernel space buffers (DANGEROUS)\n"
+" --free-locks - Cleans locks allocated during pcitool program use(dangerous in a concurrential model)\n"
" dma - Remove all buffers allocated by DMA subsystem\n"
" #number - Remove all buffers with the specified use id\n"
"\n"
@@ -2570,6 +2576,9 @@ int main(int argc, char **argv) {
event = stmp;
}
break;
+ case OPT_FREE_LOCKS:
+ mode=MODE_FREE_LOCKS;
+ break;
case OPT_TRIGGER:
if ((mode != MODE_INVALID)&&((mode != MODE_GRAB)||(grab_mode&GRAB_MODE_TRIGGER))) Usage(argc, argv, "Multiple operations are not supported");
@@ -2949,7 +2958,6 @@ int main(int argc, char **argv) {
model_info = pcilib_get_model_description(handle);
dma_info = pcilib_get_dma_description(handle);
-
switch (mode) {
case MODE_WRITE:
if (((argc - optind) == 1)&&(*argv[optind] == '*')) {
@@ -3137,6 +3145,9 @@ int main(int argc, char **argv) {
}
switch (mode) {
+ case MODE_FREE_LOCKS:
+ pcilib_clean_all_locks(handle);
+ break;
case MODE_INFO:
Info(handle, model_info);
break;