Remove unneeded code from digwatch main

userspace/digwatch/digwatch.cpp

@@ -19,7 +19,6 @@ extern "C" {
 #include <config_digwatch.h>
 #include "rules.h"
 #include "formats.h"
-#include "digwatch.h"
 #include "utils.h"
 
 
@@ -35,10 +34,7 @@ static void usage()
 	   " -m <filename>, --main-lua <filename>\n"
 	   "                    Name of lua compiler main file\n"
 	   "                    (default: rules_loader.lua)\n"
-	   " -M <num_seconds>   Stop collecting after <num_seconds> reached.\n"
 	   " -N                 Don't convert port numbers to names.\n"
-	   " -n <num>, --numevents=<num>\n"
-	   "                    Stop capturing after <num> events\n"
 	   " -r <readfile>, --read=<readfile>\n"
 	   "                    Read the events from <readfile>.\n"
 	   " --unbuffered       Turn off output buffering. This causes every single line\n"
@@ -53,42 +49,20 @@ static void usage()
 //
 // Event processing loop
 //
-captureinfo do_inspect(sinsp* inspector,
+void do_inspect(sinsp* inspector,
-		       uint64_t cnt,
-		       int duration_to_tot,
 		digwatch_rules* rules,
 		digwatch_formats* formats)
 {
-	captureinfo retval;
 	int32_t res;
 	sinsp_evt* ev;
 	string line;
-        int duration_start = 0;
 	sinsp_evt_formatter* formatter;
 
 	//
 	// Loop through the events
 	//
-	duration_start = ((double)clock()) / CLOCKS_PER_SEC;
 	while(1)
 	{
-		if(duration_to_tot > 0)
-		{
-			int duration_tot = ((double)clock()) / CLOCKS_PER_SEC - duration_start;
-			if(duration_tot >= duration_to_tot)
-			{
-				break;
-			}
-		}
-		if(retval.m_nevts == cnt)
-		{
-			//
-			// End of capture, either because the user stopped it, or because
-			// we reached the event count specified with -n.
-			//
-			break;
-		}
-
 		res = inspector->next(&ev);
 
 		if(res == SCAP_TIMEOUT)
@@ -109,8 +83,6 @@ captureinfo do_inspect(sinsp* inspector,
 			throw sinsp_exception(inspector->getlasterr().c_str());
 		}
 
-		retval.m_nevts++;
-
 		if(!inspector->is_debug_enabled() &&
 			ev->get_category() & EC_INTERNAL)
 		{
@@ -132,8 +104,6 @@ captureinfo do_inspect(sinsp* inspector,
 
 
 	}
-
-	return retval;
 }
 
 //
@@ -146,10 +116,7 @@ int digwatch_init(int argc, char **argv)
 	digwatch_rules* rules = NULL;
 	digwatch_formats* formats = NULL;
 	int op;
-	uint64_t cnt = -1;
 	sinsp_evt::param_fmt event_buffer_format = sinsp_evt::PF_NORMAL;
-	int duration_to_tot = 0;
-	captureinfo cinfo;
 	int long_index = 0;
 	string lua_main_filename;
 	string lua_dir = DIGWATCH_INSTALLATION_DIR;
@@ -158,7 +125,6 @@ int digwatch_init(int argc, char **argv)
 	static struct option long_options[] =
 	{
 		{"help", no_argument, 0, 'h' },
-		{"numevents", required_argument, 0, 'n' },
 		{"main-lua", required_argument, 0, 'u' },
 		{"readfile", required_argument, 0, 'r' },
 		{"unbuffered", no_argument, 0, 0 },
@@ -174,7 +140,7 @@ int digwatch_init(int argc, char **argv)
 		// Parse the args
 		//
 		while((op = getopt_long(argc, argv,
-                                        "hm:M:Nn:r:",
+                                        "hm:Nr:",
                                         long_options, &long_index)) != -1)
 		{
 			switch(op)
@@ -186,31 +152,9 @@ int digwatch_init(int argc, char **argv)
 			case 'm':
 				lua_main_filename = optarg;
 				break;
-			case 'M':
-				duration_to_tot = atoi(optarg);
-				if(duration_to_tot <= 0)
-				{
-					throw sinsp_exception(string("invalid duration") + optarg);
-				}
-				break;
 			case 'N':
 				inspector->set_hostname_and_port_resolution_mode(false);
 				break;
-			case 'n':
-				try
-				{
-					cnt = sinsp_numparser::parseu64(optarg);
-				}
-				catch(...)
-				{
-					throw sinsp_exception("can't parse the -n argument, make sure it's a number");
-				}
-
-				if(cnt <= 0)
-				{
-					throw sinsp_exception(string("invalid event count ") + optarg);
-				}
-				break;
 			case '?':
 				result = EXIT_FAILURE;
 				goto exit;
@@ -274,9 +218,7 @@ int digwatch_init(int argc, char **argv)
 		inspector->set_filter(rules->get_filter());
 		inspector->open("");
 
-		cinfo = do_inspect(inspector,
+		do_inspect(inspector,
-				   cnt,
-				   duration_to_tot,
 			   rules,
 			   formats);
 

userspace/digwatch/digwatch.h

@@ -1,41 +0,0 @@
-/*
-Copyright (C) 2013-2014 Draios inc.
-
-This file is part of sysdig.
-
-sysdig is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2 as
-published by the Free Software Foundation.
-
-sysdig 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 sysdig.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifdef HAS_CAPTURE
-#include "../../driver/driver_config.h"
-#endif // HAS_CAPTURE
-
-
-
-//
-// Capture results
-//
-class captureinfo
-{
-public:
-	captureinfo()
-	{
-		m_nevts = 0;
-		m_time = 0;
-	}
-
-	uint64_t m_nevts;
-	uint64_t m_time;
-};