Store ovni.part in stream metadata
Allows multiple types of streams for different system parts: thread, process, cpu, node...
This commit is contained in:
		
							parent
							
								
									9a8dc382a2
								
							
						
					
					
						commit
						8765588667
					
				| @ -220,6 +220,31 @@ report_libovni_version(struct system *sys) | |||||||
| 	return 0; | 	return 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | static int | ||||||
|  | is_thread_stream(struct stream *s) | ||||||
|  | { | ||||||
|  | 	JSON_Object *meta = stream_metadata(s); | ||||||
|  | 	if (meta == NULL) { | ||||||
|  | 		err("no metadata for stream: %s", s->relpath); | ||||||
|  | 		return -1; | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	/* All streams must have a ovni.part attribute */ | ||||||
|  | 	const char *part_type = json_object_dotget_string(meta, "ovni.part"); | ||||||
|  | 
 | ||||||
|  | 	if (part_type == NULL) { | ||||||
|  | 		err("cannot get attribute ovni.part for stream: %s", | ||||||
|  | 				s->relpath); | ||||||
|  | 		return -1; | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	if (strcmp(part_type, "thread") == 0) { | ||||||
|  | 		return 1; | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	return 0; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| static int | static int | ||||||
| create_system(struct system *sys, struct trace *trace) | create_system(struct system *sys, struct trace *trace) | ||||||
| { | { | ||||||
| @ -234,7 +259,11 @@ create_system(struct system *sys, struct trace *trace) | |||||||
| 
 | 
 | ||||||
| 	size_t i = 0; | 	size_t i = 0; | ||||||
| 	for (struct stream *s = trace->streams; s ; s = s->next) { | 	for (struct stream *s = trace->streams; s ; s = s->next) { | ||||||
| 		if (!loom_matches(s->relpath)) { | 		int m = is_thread_stream(s); | ||||||
|  | 		if (m < 0) { | ||||||
|  | 			err("is_thread_stream failed"); | ||||||
|  | 			return -1; | ||||||
|  | 		} else if (m == 0) { | ||||||
| 			warn("ignoring unknown stream %s", s->relpath); | 			warn("ignoring unknown stream %s", s->relpath); | ||||||
| 			continue; | 			continue; | ||||||
| 		} | 		} | ||||||
|  | |||||||
| @ -548,6 +548,9 @@ thread_metadata_populate(void) | |||||||
| 	if (json_object_dotset_string(meta, "ovni.lib.commit", OVNI_GIT_COMMIT) != 0) | 	if (json_object_dotset_string(meta, "ovni.lib.commit", OVNI_GIT_COMMIT) != 0) | ||||||
| 		die("json_object_dotset_string failed"); | 		die("json_object_dotset_string failed"); | ||||||
| 
 | 
 | ||||||
|  | 	if (json_object_dotset_string(meta, "ovni.part", "thread") != 0) | ||||||
|  | 		die("json_object_dotset_string failed"); | ||||||
|  | 
 | ||||||
| 	if (json_object_dotset_number(meta, "ovni.tid", (double) rthread.tid) != 0) | 	if (json_object_dotset_number(meta, "ovni.tid", (double) rthread.tid) != 0) | ||||||
| 		die("json_object_dotset_number failed"); | 		die("json_object_dotset_number failed"); | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user