Attachment 157139 Details for Bug 244182 – added debugging

[patch] added debugging

gtkterm-debug.patch (text/plain), 7.08 KB, created by Dan Horák on 2007-06-15 18:22:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Horák

Created: 2007-06-15 18:22:00 UTC

Size: 7.08 KB

patch

obsolete

>BinÃ¡rnÃ soubory gtkterm-0.99.5/po/fr.gmo a gtkterm-0.99.5-devel/po/fr.gmo jsou rÅ¯znÃ©
>BinÃ¡rnÃ soubory gtkterm-0.99.5/po/hu.gmo a gtkterm-0.99.5-devel/po/hu.gmo jsou rÅ¯znÃ©
>diff -Nru gtkterm-0.99.5/po/stamp-po gtkterm-0.99.5-devel/po/stamp-po
>--- gtkterm-0.99.5/po/stamp-po	2005-11-14 20:44:47.000000000 +0100
>+++ gtkterm-0.99.5-devel/po/stamp-po	1970-01-01 01:00:00.000000000 +0100
>@@ -1 +0,0 @@
>-timestamp
>diff -Nru gtkterm-0.99.5/src/buffer.c gtkterm-0.99.5-devel/src/buffer.c
>--- gtkterm-0.99.5/src/buffer.c	2005-09-22 21:33:44.000000000 +0200
>+++ gtkterm-0.99.5-devel/src/buffer.c	2007-06-15 19:33:38.000000000 +0200
>@@ -24,6 +24,8 @@
> #include "gettext.h"
> #include "i18n.h"
> 
>+#include "debug.h"
>+
> static char *buffer = NULL;
> static char *current_buffer;
> static unsigned int pointer;
>@@ -116,6 +118,8 @@
>       pointer += size;
>       current_buffer += size;
>     }
>+    
>+    debug_write_buffer(characters, size);
>   
>   if(write_func != NULL)
>     write_func(characters, size);
>diff -Nru gtkterm-0.99.5/src/debug.c gtkterm-0.99.5-devel/src/debug.c
>--- gtkterm-0.99.5/src/debug.c	1970-01-01 01:00:00.000000000 +0100
>+++ gtkterm-0.99.5-devel/src/debug.c	2007-06-15 19:35:51.000000000 +0200
>@@ -0,0 +1,37 @@
>+/* debug.c */
>+#include <glib.h>
>+#include <stdio.h>
>+#include <stdlib.h>
>+
>+FILE *data_raw;
>+FILE *data_buffer;
>+FILE *data_term;
>+
>+void debug_init()
>+{
>+    data_raw = fopen("/tmp/gtkterm-raw.data", "w");
>+    data_buffer = fopen("/tmp/gtkterm-buffer.data", "w");
>+    data_term = fopen("/tmp/gtkterm-term.data", "w");
>+}
>+
>+void debug_done()
>+{
>+    fclose(data_raw);
>+    fclose(data_buffer);
>+    fclose(data_term);
>+}
>+
>+void debug_write_raw(gchar *buf, guint size)
>+{
>+    fwrite(buf, size, 1, data_raw);
>+}
>+
>+void debug_write_buffer(gchar *buf, guint size)
>+{
>+    fwrite(buf, size, 1, data_buffer);
>+}
>+
>+void debug_write_term(gchar *buf, guint size)
>+{
>+    fwrite(buf, size, 1, data_term);
>+}
>diff -Nru gtkterm-0.99.5/src/debug.h gtkterm-0.99.5-devel/src/debug.h
>--- gtkterm-0.99.5/src/debug.h	1970-01-01 01:00:00.000000000 +0100
>+++ gtkterm-0.99.5-devel/src/debug.h	2007-06-15 19:34:05.000000000 +0200
>@@ -0,0 +1,7 @@
>+/* debug.h */
>+
>+void debug_init();
>+void debug_done();
>+void debug_write_raw(gchar *buf, guint size);
>+void debug_write_buffer(gchar *buf, guint size);
>+void debug_write_term(gchar *buf, guint size);
>diff -Nru gtkterm-0.99.5/src/gtkterm.c gtkterm-0.99.5-devel/src/gtkterm.c
>--- gtkterm-0.99.5/src/gtkterm.c	2003-08-15 14:19:22.000000000 +0200
>+++ gtkterm-0.99.5-devel/src/gtkterm.c	2007-06-15 18:22:26.000000000 +0200
>@@ -31,6 +31,8 @@
> #include "auto_config.h"
> #include "gettext.h"
> 
>+#include "debug.h"
>+
> int main(int argc, char *argv[])
> {
>   gchar *message;
>@@ -43,6 +45,8 @@
>   (void)textdomain(PACKAGE);
> 
>   gtk_init(&argc, &argv);
>+  
>+  debug_init();
> 
>   create_buffer();
>  
>@@ -70,6 +74,8 @@
>   delete_buffer();
> 
>   Close_port_and_remove_lockfile();
>+  
>+  debug_done();
> 
>   return 0;
> }
>diff -Nru gtkterm-0.99.5/src/Makefile.am gtkterm-0.99.5-devel/src/Makefile.am
>--- gtkterm-0.99.5/src/Makefile.am	2003-03-09 00:38:57.000000000 +0100
>+++ gtkterm-0.99.5-devel/src/Makefile.am	2007-06-15 18:02:49.000000000 +0200
>@@ -1,6 +1,6 @@
> bin_PROGRAMS = gtkterm
> 
>-gtkterm_SOURCES = config.c fichier.c gtkterm.c serie.c config.h fichier.h serie.h widgets.c widgets.h cmdline.c cmdline.h parsecfg.c parsecfg.h buffer.c buffer.h macros.c macros.h i18n.c i18n.h gettext.h auto_config.h
>+gtkterm_SOURCES = config.c fichier.c gtkterm.c serie.c config.h fichier.h serie.h widgets.c widgets.h cmdline.c cmdline.h parsecfg.c parsecfg.h buffer.c buffer.h macros.c macros.h i18n.c i18n.h gettext.h auto_config.h debug.c debug.h
> 
> CLEANFILES = *~
> 
>diff -Nru gtkterm-0.99.5/src/Makefile.in gtkterm-0.99.5-devel/src/Makefile.in
>--- gtkterm-0.99.5/src/Makefile.in	2005-09-22 22:04:01.000000000 +0200
>+++ gtkterm-0.99.5-devel/src/Makefile.in	2007-06-15 18:09:01.000000000 +0200
>@@ -112,7 +112,7 @@
> localedir = @localedir@
> bin_PROGRAMS = gtkterm
> 
>-gtkterm_SOURCES = config.c fichier.c gtkterm.c serie.c config.h fichier.h serie.h widgets.c widgets.h cmdline.c cmdline.h parsecfg.c parsecfg.h buffer.c buffer.h macros.c macros.h i18n.c i18n.h gettext.h auto_config.h
>+gtkterm_SOURCES = config.c fichier.c gtkterm.c serie.c config.h fichier.h serie.h widgets.c widgets.h cmdline.c cmdline.h parsecfg.c parsecfg.h buffer.c buffer.h macros.c macros.h i18n.c i18n.h gettext.h auto_config.h debug.c debug.h
> 
> CLEANFILES = *~
> 
>@@ -127,7 +127,7 @@
> am_gtkterm_OBJECTS = config.$(OBJEXT) fichier.$(OBJEXT) \
> 	gtkterm.$(OBJEXT) serie.$(OBJEXT) widgets.$(OBJEXT) \
> 	cmdline.$(OBJEXT) parsecfg.$(OBJEXT) buffer.$(OBJEXT) \
>-	macros.$(OBJEXT) i18n.$(OBJEXT)
>+	macros.$(OBJEXT) i18n.$(OBJEXT) debug.$(OBJEXT)
> gtkterm_OBJECTS = $(am_gtkterm_OBJECTS)
> gtkterm_LDADD = $(LDADD)
> gtkterm_DEPENDENCIES =
>@@ -141,10 +141,11 @@
> depcomp = $(SHELL) $(top_srcdir)/depcomp
> am__depfiles_maybe = depfiles
> @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/buffer.Po ./$(DEPDIR)/cmdline.Po \
>-@AMDEP_TRUE@	./$(DEPDIR)/config.Po ./$(DEPDIR)/fichier.Po \
>-@AMDEP_TRUE@	./$(DEPDIR)/gtkterm.Po ./$(DEPDIR)/i18n.Po \
>-@AMDEP_TRUE@	./$(DEPDIR)/macros.Po ./$(DEPDIR)/parsecfg.Po \
>-@AMDEP_TRUE@	./$(DEPDIR)/serie.Po ./$(DEPDIR)/widgets.Po
>+@AMDEP_TRUE@	./$(DEPDIR)/config.Po ./$(DEPDIR)/debug.Po \
>+@AMDEP_TRUE@	./$(DEPDIR)/fichier.Po ./$(DEPDIR)/gtkterm.Po \
>+@AMDEP_TRUE@	./$(DEPDIR)/i18n.Po ./$(DEPDIR)/macros.Po \
>+@AMDEP_TRUE@	./$(DEPDIR)/parsecfg.Po ./$(DEPDIR)/serie.Po \
>+@AMDEP_TRUE@	./$(DEPDIR)/widgets.Po
> COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
> 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
> CCLD = $(CC)
>@@ -200,6 +201,7 @@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmdline.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Po@am__quote@
>+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fichier.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkterm.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i18n.Po@am__quote@
>diff -Nru gtkterm-0.99.5/src/serie.c gtkterm-0.99.5-devel/src/serie.c
>--- gtkterm-0.99.5/src/serie.c	2005-09-22 21:49:38.000000000 +0200
>+++ gtkterm-0.99.5-devel/src/serie.c	2007-06-15 19:32:29.000000000 +0200
>@@ -42,6 +42,8 @@
> #include "buffer.h"
> #include "i18n.h"
> 
>+#include "debug.h"
>+
> struct termios termios_save;
> int serial_port_fd = -1;
> 
>@@ -73,6 +75,7 @@
>       if(bytes_read > 0)
> 	{
> 	  put_chars(c, bytes_read, config.crlfauto);
>+	  debug_write_raw(c, bytes_read);
> 
> 	  if(config.car != -1 && waiting_for_char == TRUE)
> 	    {
>diff -Nru gtkterm-0.99.5/src/widgets.c gtkterm-0.99.5-devel/src/widgets.c
>--- gtkterm-0.99.5/src/widgets.c	2005-09-22 22:13:00.000000000 +0200
>+++ gtkterm-0.99.5-devel/src/widgets.c	2007-06-15 19:36:53.000000000 +0200
>@@ -70,6 +70,8 @@
> #include "gettext.h"
> #include "auto_config.h"
> 
>+#include "debug.h"
>+
> guint id;
> gboolean echo_on;
> gboolean crlfauto_on;
>@@ -460,6 +462,8 @@
> 	  size += 1;
> 	}
>     }
>+    
>+    debug_write_term(buffer_tmp->str, size);
> 
>   vte_terminal_feed(VTE_TERMINAL(display), buffer_tmp->str, size);
> }

Actions: View | Diff

Attachments on bug 244182: 156988 | 156989 | 157139 | 157140 | 157187