Bläddra i källkod

Fix internal API usage and add support for file_name

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1976 fd59a12c-fef9-0310-b244-a6a79926bd2f
Fabio M. Di Nitto 17 år sedan
förälder
incheckning
2a5bd53771
1 ändrade filer med 15 tillägg och 2 borttagningar
  1. 15 2
      exec/logsys.c

+ 15 - 2
exec/logsys.c

@@ -308,8 +308,8 @@ static inline int strcpy_cutoff (char *dest, const char *src, int cutoff)
 */
 static void log_printf_to_logs (
 	const char *subsys,
-	const char *function_name,
 	const char *file_name,
+	const char *function_name,
 	int file_line,
 	unsigned int level,
 	char *buffer)
@@ -345,6 +345,11 @@ static void log_printf_to_logs (
 					output_buffer_idx += len;
 					break;
 
+				case 'f':
+					len = strcpy_cutoff (&output_buffer[output_buffer_idx], file_name, cutoff);
+					output_buffer_idx += len;
+					break;
+
 				case 'l':
 					sprintf (line_no, "%d", file_line);
 					len = strcpy_cutoff (&output_buffer[output_buffer_idx], line_no, cutoff);
@@ -430,6 +435,14 @@ static void record_print (char *buf)
 		arg_size_idx += buf_uint32t[arg_size_idx] + 1;
 		words_processed += buf_uint32t[arg_size_idx] + 1;
 	}
+
+	/*
+	 * (char *)arguments[0] -> subsystem
+	 * (char *)arguments[1] -> file_name
+	 * (char *)arguments[2] -> function_name
+	 * (char *)arguments[3] -> message
+	 */
+
 	log_printf_to_logs (
 		(char *)arguments[0],
 		(char *)arguments[1],
@@ -839,7 +852,7 @@ void _logsys_log_printf (
 		 * expect the worker thread to output the log data once signaled
 		 */
 		log_printf_to_logs (logsys_loggers[subsys].subsys,
-			function_name, file_name, file_line, level,
+			file_name, function_name, file_line, level,
 			logsys_print_buffer);
 	} else {
 		/*