darshan-ruby 3.1.3.1 → 3.1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69c95e4a57639a0553d084a0c178fb5dcadf32af
-  data.tar.gz: 04f9df843f9f6f9c3c7fd65b232584aa2f2bf3ad
+  metadata.gz: c25bc9473ebb0270d6b0e8835d0accb552ee8680
+  data.tar.gz: e33af97cec39ed8d4a69a8adc80d0ec4aacbfd6c
 SHA512:
-  metadata.gz: 6df17c156006d7bf4e3d4882bcbb2c6528675c23f02264fa224d519f04ee413a474d261a7c6024e49770222547e4b11ac28cdff1dbd8e11ecbcd2639f105d54e
-  data.tar.gz: 30d5c834cfe0c1ca7864cc15180c7656ccfa249dd365232bc53a6e6d16f28fcc362f3321feef962059b5d6c12cdec849ba6ca73e5eec18b36af41b9a153bcf4f
+  metadata.gz: e9e67e9a0b26c9376676425c0e0e2eea2b62d0f2acd3816dc72f0f7f05fffdee032d496b14fb0be14dc28760f547a5810eda9d8431ec7bb28a89c1934f685aee
+  data.tar.gz: 682817301e9e66c90564b0c74a7273f4cf9fc17128029f0373b100b0af2df8149e917e0f46e65d8c7ed93ea5410c8bac3cebcab573f66d2a8040c12fba61391f

data/bin/quarshan

@@ -14,25 +14,27 @@ require 'darshan'
 require 'optparse'
 
 # List of Darshan modules
-$darshan_mods = { "POSIX" 	=> Darshan::POSIX, 
+$darshan_mods = { 
+		  "POSIX" 	=> Darshan::POSIX, 
 		  "MPI-IO" 	=> Darshan::MPIIO,
 		  "HDF5" 	=> Darshan::HDF5, 
 		  "PNETCDF"	=> Darshan::PNETCDF,
 		  "BG/Q"	=> Darshan::BGQ, 
 		  "LUSTRE"	=> Darshan::LUSTRE,
-		  "STDIO"	=> Darshan::STDIO }
+		  "STDIO"	=> Darshan::STDIO 
+}
 
 # List of available reduction operations
 $reduction_ops = ['min','max','avg','var','std','med', 'sum']
 
 # Structure for option parsing
-Options = Struct.new(:counters,:query,:reductions,:header,:files,:mod,:qcounters)
+Options = Struct.new(:counters,:query,:reductions,:header,:prefix,:files,:mod,:qcounters,:info)
 
 # Option parsing class
 class Parser
 
 	def self.parse(options)
-		args = Options.new([],'true',[],false,[],nil,[])
+		args = Options.new([],'true',[],false,'',[],nil,[],false)
 		opt_parser = OptionParser.new do |opts|
 			opts.banner = "Usage: quarshan file1 [file2 [...]] [options]"
 
@@ -52,6 +54,14 @@ class Parser
 				args.reductions = r.split(',')
 			end
 
+			opts.on("-p", "--prefix PREFIX", "Prefixes that file records should have to be considered") do |r|
+				args.prefix = r
+			end
+
+			opts.on("-i", "--info", "Prints information about files that satisfy a query") do | r |
+				args.info = true
+			end
+
 			opts.on("-h", "--help", "Prints this help") do
 				puts opts
 				exit
@@ -64,8 +74,9 @@ class Parser
 	end
 
 	def self.validate(args)
-		# check that at least one counter is provided, otherwise we can exit right now
-		if(args.counters.size == 0)
+		# check that at least one counter is provided, otherwise we can exit right now,
+		# unless the user wants the file's informations
+		if(args.counters.size == 0 && args.info == false)
 			exit(0)
 		end
 		# check that if reductions are present, there are as many as counters, or 1
@@ -87,15 +98,17 @@ class Parser
 			end
 		end
 		# deduce the module based on the first counter's name
-		for name,mod in $darshan_mods
-			counter = args.counters[0]
-			if(mod::NAMES.include?(counter))
-				args.mod = mod
-				break
+		if args.counters.size != 0
+			for name,mod in $darshan_mods
+				counter = args.counters[0]
+				if(mod::NAMES.include?(counter))
+					args.mod = mod
+					break
+				end
 			end
 		end
 		# if module not found, error
-		if(args.mod == nil)
+		if(args.mod == nil && args.counters.size != 0)
 			$stderr << "Could not deduce Darshan module from provided counters\n"
 			exit(-1)
 		end
@@ -146,8 +159,10 @@ class Query
 		@header = args.header
 		@mod = args.mod
 		@query = args.query
+		@prefix = args.prefix == [] ? "" :  args.prefix
 		@counters = args.counters
 		@qcounters = args.qcounters
+		@info = args.info
 		@counters_idx = [nil]*@counters.size
 		@qcounters_idx = [nil]*@counters.size
 		for i in 0...@counters.size
@@ -158,31 +173,78 @@ class Query
 		end
 		@reductions = args.reductions
 		@results = []
+		# @results[0] is a column of record names
+		# @results[1] to @results[@counters.size] are columns of results
+		# @results[@counters.size+1] is a hash associating a line X to a LogFileInfo object
 		(@counters.size+1).times do
 			@results << []
 		end
+		@results << {} # for LogFileInfo
+	end
+
+	def get_logfile_info(file,mods=[])
+		res = "# ----- NEW LOG FILE ----\n"
+		res += "# name: #{file.name}\n"
+		res += "# darshan version: #{file.version}\n"
+		res += "# executable: #{file.exe}\n"
+		res += "# uid: #{file.uid}\n"
+		res += "# job id: #{file.job_id}\n"
+		res += "# nprocs: #{file.nprocs}\n"
+		res += "# start time: #{file.start_time}\n"
+		res += "# end time: #{file.end_time}\n"
+		res += "# metadata: #{file.metadata}\n"
+		res += "# mount points: \n"
+		file.mount_points.each do | mp |
+			res += "#\t#{mp[:path]} (#{mp[:type]})\n"
+		end
+		res += "# modules:"
+		for m in mods
+			res += " #{m}"
+		end
+		res += "\n"
+		return res
 	end
 
 	def read_file(filename)
+		current_line = @results[0].size
 		Darshan::LogFile.open(filename) do |file|
+			log_processed = false
+			modules_present = []
 			file.each_module do | m |
+				modules_present << m.name
 				next if @mod != $darshan_mods[m.name]
 				m.each_record do | r |
-					process_record(r)
+					if r.name.start_with?(@prefix)
+						b = process_record(r)
+						log_processed = true if b
+					end
+				end
+			end
+			if (log_processed || @counters.size == 0) && @info
+				idx = 0
+				if @counters.size == 0
+					idx = @results[-1].size
+				else
+					idx = current_line
 				end
+				@results[-1][idx] = get_logfile_info(file,modules_present)
 			end
 		end
 	end
 
 	def process_record(record)
-		return if(!query_satisfied(record))
+		return false if(!query_satisfied(record))
 		@results[0] << record.name
 		for i in 0...@counters_idx.size
 			@results[i+1] << record.counter(@counters_idx[i])
 		end
+		return true
 	end
 
 	def query_satisfied(record)
+		if @counters.size == 0
+			return false
+		end
 		str = ""
 		for i in 0...@qcounters.size
 			str += "#{@qcounters[i].downcase}=#{record.counter(@qcounters_idx[i])}; "
@@ -201,7 +263,7 @@ class Query
 
 	def to_s
 		res = ""
-		if(@header)
+		if(@header && @counters.size != 0)
 			res += "# records\t"
 			for i in 0...@counters.size
 				if(@reductions.size == 0)
@@ -212,11 +274,22 @@ class Query
 			end
 			res += "\n"
 		end
-		for j in 0...@results[0].size
-			for i in 0...@results.size
+
+		if @counters.size != 0
+		  for j in 0...@results[0].size # for all rows
+			if (@results[-1][j] != nil) && (@reductions.size == 0)
+				# print the file info
+				res += "#{@results[-1][j]}"
+			end
+			for i in 0...(@results.size-1) # for all columns
 				res += "#{@results[i][j]}\t"
 			end
 			res += "\n"
+		  end
+		else # @counters.size == 0
+			@results[-1].each do |k,v|
+				res += v
+			end
 		end
 		return res
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darshan-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.3.1
+  version: 3.1.4.1
 platform: ruby
 authors:
 - Matthieu Dorier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies: []
 description: Ruby binding to ANL's Darshan library for HPC I/O tracing and analysis
 email: mdorier@anl.gov
@@ -63,5 +63,5 @@ rubyforge_project: nowarning
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Ruby binding to Darshan version 3.1.3 and above
+summary: Ruby binding to Darshan version 3.1.4 and above
 test_files: []