Move trace file writer out of tracepoint.c

This patch is a refactor which moves trace file writer related code
out of tracepoint.c, which has 6k LOC.  It moves general trace file
writer to a new file tracefile.c and moves tfile specific writer to
tracefile-tfile.c.

gdb:

2014-02-23  Yao Qi  <yao@codesourcery.com>

	* Makefile.in (REMOTE_OBS): Append tracefile.o and
	tracefile-tfile.o.
	(HFILES_NO_SRCDIR): Add tracefile.h.
	* ctf.c: Include "tracefile.h".
	* tracefile.h: New file.
	* tracefile.c: New file
	* tracefile-tfile.c: New file.
	* tracepoint.c: Include "tracefile.h".
	(free_uploaded_tps, free_uploaded_tsvs): Remove declarations.
	(stop_reason_names): Add const.
	(trace_file_writer_xfree): Move it to tracefile.c.
	(trace_save, trace_save_command, trace_save_tfile): Likewise.
	(trace_save_ctf): Likewise.
	(struct tfile_trace_file_writer): Move it to tracefile-tfile.c.
	(tfile_target_save, tfile_dtor, tfile_start): Likewise.
	(tfile_write_header, tfile_write_regblock_type): Likewise.
	(tfile_write_status, tfile_write_uploaded_tsv): Likewise.
	(tfile_write_uploaded_tp, tfile_write_definition_end): Likewise.
	(tfile_write_raw_data, tfile_end): Likewise.
	(tfile_trace_file_writer_new): Likewise.
	(free_uploaded_tp): Make it extern.
	(free_uploaded_tsv): Make it extern.
	(_initialize_tracepoint): Move code to register command 'tsave'
	to tracefile.c.
	* tracepoint.h (stop_reason_names): Declare.
	(struct trace_frame_write_ops): Move it to tracefile.h.
	(struct trace_file_write_ops): Likewise.
	(struct trace_file_writer): Likewise.
	(free_uploaded_tsvs, free_uploaded_tps): Declare.

1 files changed, 5 insertions, 105 deletions

diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index dd9b48b..6b00b30 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -155,6 +155,8 @@ extern char *default_collect;
 
 extern int trace_regblock_size;
 
+extern const char *stop_reason_names[];
+
 /* Struct to collect random info about tracepoints on the target.  */
 
 struct uploaded_tp
@@ -218,111 +220,6 @@ struct static_tracepoint_marker
   char *extra;
 };
 
-struct trace_file_writer;
-
-/* Operations to write trace frames to a specific trace format.  */
-
-struct trace_frame_write_ops
-{
-  /* Write a new trace frame.  The tracepoint number of this trace
-     frame is TPNUM.  */
-  void (*start) (struct trace_file_writer *self, uint16_t tpnum);
-
-  /* Write an 'R' block.  Buffer BUF contains its contents and SIZE is
-     its size.  */
-  void (*write_r_block) (struct trace_file_writer *self,
-			 gdb_byte *buf, int32_t size);
-
-  /* Write an 'M' block, the header and memory contents respectively.
-     The header of 'M' block is composed of the start address and the
-     length of memory collection, and the memory contents contain
-     the collected memory contents in tracing.
-     For extremely large M block, GDB is unable to get its contents
-     and write them into trace file in one go, due to the limitation
-     of the remote target or the size of internal buffer, we split
-     the operation to 'M' block to two operations.  */
-  /* Write the head of 'M' block.  ADDR is the start address of
-     collected memory and LENGTH is the length of memory contents.  */
-  void (*write_m_block_header) (struct trace_file_writer *self,
-				uint64_t addr, uint16_t length);
-  /* Write the memory contents of 'M' block.  Buffer BUF contains
-     its contents and LENGTH is its length.  This method can be called
-     multiple times to write large memory contents of a single 'M'
-     block.  */
-  void (*write_m_block_memory) (struct trace_file_writer *self,
-				gdb_byte *buf, uint16_t length);
-
-  /* Write a 'V' block.  NUM is the trace variable number and VAL is
-     the value of the trace variable.  */
-  void (*write_v_block) (struct trace_file_writer *self, int32_t num,
-			 uint64_t val);
-
-  /* The end of the trace frame.  */
-  void (*end) (struct trace_file_writer *self);
-};
-
-/* Operations to write trace buffers to a specific trace format.  */
-
-struct trace_file_write_ops
-{
-  /* Destructor.  Releases everything from SELF (but not SELF
-     itself).  */
-  void (*dtor) (struct trace_file_writer *self);
-
-  /*  Save the data to file or directory NAME of desired format in
-      target side.  Return true for success, otherwise return
-      false.  */
-  int (*target_save) (struct trace_file_writer *self,
-		      const char *name);
-
-  /* Write the trace buffers to file or directory NAME.  */
-  void (*start) (struct trace_file_writer *self,
-		 const char *name);
-
-  /* Write the trace header.  */
-  void (*write_header) (struct trace_file_writer *self);
-
-  /* Write the type of block about registers.  SIZE is the size of
-     all registers on the target.  */
-  void (*write_regblock_type) (struct trace_file_writer *self,
-			       int size);
-
-  /* Write trace status TS.  */
-  void (*write_status) (struct trace_file_writer *self,
-			struct trace_status *ts);
-
-  /* Write the uploaded TSV.  */
-  void (*write_uploaded_tsv) (struct trace_file_writer *self,
-			      struct uploaded_tsv *tsv);
-
-  /* Write the uploaded tracepoint TP.  */
-  void (*write_uploaded_tp) (struct trace_file_writer *self,
-			     struct uploaded_tp *tp);
-
-  /* Write to mark the end of the definition part.  */
-  void (*write_definition_end) (struct trace_file_writer *self);
-
-  /* Write the data of trace buffer without parsing.  The content is
-     in BUF and length is LEN.  */
-  void (*write_trace_buffer) (struct trace_file_writer *self,
-			      gdb_byte *buf, LONGEST len);
-
-  /* Operations to write trace frames.  The user of this field is
-     responsible to parse the data of trace buffer.  Either field
-     'write_trace_buffer' or field ' frame_ops' is NULL.  */
-  const struct trace_frame_write_ops *frame_ops;
-
-  /* The end of writing trace buffers.  */
-  void (*end) (struct trace_file_writer *self);
-};
-
-/* Trace file writer for a given format.  */
-
-struct trace_file_writer
-{
-  const struct trace_file_write_ops *ops;
-};
-
 struct memrange
 {
   /* memrange_absolute for absolute memory range, else basereg
@@ -424,8 +321,11 @@ extern void parse_tsv_definition (char *line, struct uploaded_tsv **utsvp);
 
 extern struct uploaded_tp *get_uploaded_tp (int num, ULONGEST addr,
 					    struct uploaded_tp **utpp);
+extern void free_uploaded_tps (struct uploaded_tp **utpp);
+
 extern struct uploaded_tsv *get_uploaded_tsv (int num,
 					      struct uploaded_tsv **utsvp);
+extern void free_uploaded_tsvs (struct uploaded_tsv **utsvp);
 extern struct tracepoint *create_tracepoint_from_upload (struct uploaded_tp *utp);
 extern void merge_uploaded_tracepoints (struct uploaded_tp **utpp);
 extern void merge_uploaded_trace_state_variables (struct uploaded_tsv **utsvp);