Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
cardigliano committed Dec 17, 2024
1 parent f4c83aa commit 119b61d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
1 change: 0 additions & 1 deletion userland/examples/pfcount.c
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,6 @@ void printHelp(void) {
" - ethX@Y for channels\n"
" - zc:ethX for ZC devices\n"
" - pcap:ethX or pcap:example.pcap for pcap devices/files\n"
" - sysdig: for capturing sysdig events\n"
#ifdef HAVE_DAG
" - dag:dagX:Y for Endace DAG cards\n"
#endif
Expand Down
11 changes: 3 additions & 8 deletions userland/examples_zc/zcount_ipc.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ struct volatile_globals {
unsigned long long numPkts;
unsigned long long numBytes;
int wait_for_packet;
u_int8_t verbose, dump_as_sysdig_event;
u_int8_t verbose;
volatile int do_shutdown;
};

Expand Down Expand Up @@ -152,7 +152,6 @@ void printHelp(void) {
printf("-a Active packet wait\n");
printf("-f <bpf> Set a BPF filter\n");
printf("-v Verbose: print packet data\n");
printf("-s In case of -v dump the buffer as sysdig event instead of packet bytes\n");
printf("-t Touch payload (to force packet load on cache)\n");
printf("-u Guest VM (master on the host)\n");
exit(-1);
Expand Down Expand Up @@ -204,12 +203,12 @@ int main(int argc, char* argv[]) {
char c;
int cluster_id = DEFAULT_CLUSTER_ID+1, queue_id = -1;
pthread_t my_thread;
int wait_for_packet = 1, verbose = 0, dump_as_sysdig_event = 0;
int wait_for_packet = 1, verbose = 0;
char *filter = NULL;

startTime.tv_sec = 0;

while((c = getopt(argc,argv,"ac:f:g:hi:svut")) != '?') {
while((c = getopt(argc,argv,"ac:f:g:hi:vut")) != '?') {
if((c == 255) || (c == -1)) break;

switch(c) {
Expand All @@ -231,9 +230,6 @@ int main(int argc, char* argv[]) {
case 'g':
bind_core = atoi(optarg);
break;
case 's':
dump_as_sysdig_event = 1;
break;
case 'v':
verbose = 1;
break;
Expand All @@ -255,7 +251,6 @@ int main(int argc, char* argv[]) {
globals = calloc(1, sizeof(*globals));
globals->wait_for_packet = wait_for_packet;
globals->verbose = verbose;
globals->dump_as_sysdig_event = dump_as_sysdig_event;
globals->numPkts = 0;
globals->numBytes = 0;
globals->do_shutdown = 0;
Expand Down
2 changes: 1 addition & 1 deletion userland/lib/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ install: install-static install-shared

install-includes:
mkdir -p $(DESTDIR)$(includedir)
cp pfring.h pfring_mod_sysdig.h pfring_mod_pcap.h @PF_RING_ZC_H@ @PF_RING_FT_H@ @NPCAP_H@ ${NBPF_HDR} $(DESTDIR)$(includedir)/
cp pfring.h pfring_mod_pcap.h @PF_RING_ZC_H@ @PF_RING_FT_H@ @NPCAP_H@ ${NBPF_HDR} $(DESTDIR)$(includedir)/

install-static: ${STATICLIB} install-includes
mkdir -p $(DESTDIR)$(libdir)
Expand Down

0 comments on commit 119b61d

Please sign in to comment.