summaryrefslogtreecommitdiff
path: root/gr-run-waveform
diff options
context:
space:
mode:
authorRob Savoye2010-11-28 11:51:08 -0700
committerRob Savoye2010-11-28 11:51:08 -0700
commit678f405e3abcdae357a1b583d94bf2005a3bbdc0 (patch)
tree098d00ffd2681c3f9b72e2b6c487bdf77fea0ed6 /gr-run-waveform
parent8725c06dc3540f802fc78d5fb4d7059bcbd6f942 (diff)
downloadgnuradio-678f405e3abcdae357a1b583d94bf2005a3bbdc0.tar.gz
gnuradio-678f405e3abcdae357a1b583d94bf2005a3bbdc0.tar.bz2
gnuradio-678f405e3abcdae357a1b583d94bf2005a3bbdc0.zip
#ifdef in make_read_only_port to change how it segfaults
Diffstat (limited to 'gr-run-waveform')
-rw-r--r--gr-run-waveform/xyzzy.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/gr-run-waveform/xyzzy.cc b/gr-run-waveform/xyzzy.cc
index 4123c9afc..059edbe08 100644
--- a/gr-run-waveform/xyzzy.cc
+++ b/gr-run-waveform/xyzzy.cc
@@ -128,10 +128,15 @@ XYZZY::file_exists(const std::string &filespec)
SCM
XYZZY::make_read_only_port(const std::string &filespec)
{
- _portbits = scm_make_port_type(const_cast<char *>(filespec.c_str()),
- xyzzy_fill_input, xyzzy_write);
+#if 0
+ char *filename = const_cast<char *>(filespec.c_str());
+ _portbits = scm_make_port_type(filename, xyzzy_fill_input, xyzzy_write);
scm_set_port_flush (_portbits, xyzzy_flush);
scm_set_port_close (_portbits, xyzzy_close);
+#else
+ SCM result;
+ return result;
+#endif
}
string
@@ -219,19 +224,12 @@ SCM_DEFINE (scm_i_make_gnuradio, "%make-gnuradio-port", 1, 0, 0,
else if (scm_is_true (scm_input_port_p (port)))
mode |= SCM_RDNG;
- fprintf(stderr, "TRACE %s: %d\n", __FUNCTION__, __LINE__);
result = make_xyzzy (port, mode);
return result;
}
void
-xyzzy_write (SCM port, const void *data, size_t size)
-{
- // This is a read only file
-}
-
-void
xyzzy_flush (SCM port)
{
SCM bport = SCM_PACK(SCM_STREAM(port));
@@ -267,8 +265,6 @@ make_xyzzy (SCM binary_port, unsigned long mode)
const unsigned long mode_bits = SCM_OPN | mode;
scm_t_bits bits = datafile.getPortBits();
- fprintf(stderr, "TRACE %s: %d\n", __FUNCTION__, __LINE__);
-
scm_i_pthread_mutex_lock (&scm_i_port_table_mutex);
port = scm_new_port_table_entry (bits);
@@ -290,13 +286,17 @@ make_xyzzy (SCM binary_port, unsigned long mode)
return port;
}
+void
+xyzzy_write (SCM port, const void *data, size_t size)
+{
+ // This is a read only file
+}
+
int
xyzzy_fill_input (SCM port)
{
scm_t_port *gr_port = SCM_PTAB_ENTRY (port);
- fprintf(stderr, "TRACE %s: %d:\n", __FUNCTION__, __LINE__);
-
// if (gr_port->read_pos + gr_port->read_buf_size > gr_port->read_end) {
// return EOF;
// }