Use tellp

Author: arahlin

core/include/core/dataio.h

@@ -59,15 +59,6 @@ void
 g3_ostream_to_path(std::ostream &stream, const std::string &path, bool append=false,
     size_t buffersize=1024*1024, const std::string &ext=".g3");
 
-/**
- * Count the number of bytes written to the output file stream.
- *
- * @param  stream   A reference to the output stream, as configured by
- *                  g3_ostream_to_path with the counter argument set to true.
- * @return Number of bytes written to disk.
- */
-size_t g3_ostream_count(std::ostream &stream);
-
 /**
  * Flush the output file stream.
  *

core/src/G3MultiFileWriter.cxx

@@ -86,7 +86,7 @@ G3MultiFileWriter::CheckNewFile(G3FramePtr frame)
 	if (stream_) {
 		bool start_new_ = false;
 
-		if (g3_ostream_count(stream_) > size_limit_)
+		if (stream_.tellp() > size_limit_)
 			start_new_ = true;
 
 		if (newfile_callback_.ptr() != Py_None &&

core/src/dataio.cxx

@@ -225,7 +225,7 @@ class RemoteInputStreamBuffer : public std::streambuf {
 	std::streampos seekoff(std::streamoff off, std::ios_base::seekdir way,
 	    std::ios_base::openmode mode) {
 		// short-circuit for tellg
-		if (off == 0 && way == std::ios_base::cur)
+		if ((mode & std::ios_base::in) && off == 0 && way == std::ios_base::cur)
 			return bytes_;
 		log_fatal("Seek not implemented for remote stream");
 	}
@@ -403,6 +403,8 @@ class InputStreamCounter : public std::streambuf {
 
 	std::streampos seekoff(std::streamoff off, std::ios_base::seekdir way,
 	    std::ios_base::openmode mode) {
+		if (!(mode & std::ios_base::in))
+			log_fatal("Seek not implemented for output stream");
 		// short-circuit for tellg
 		if (off == 0 && way == std::ios_base::cur)
 			return bytes_;
@@ -413,6 +415,8 @@ class InputStreamCounter : public std::streambuf {
 	}
 
 	std::streampos seekpos(std::streampos pos, std::ios_base::openmode mode) {
+		if (!(mode & std::ios_base::in))
+			log_fatal("Seek not implemented for output stream");
 		std::streampos n = buffer_->pubseekpos(pos, mode);
 		if (n != std::streampos(std::streamoff(-1)))
 			bytes_ = n;
@@ -524,20 +528,34 @@ class OutputStreamCounter : public std::streambuf {
 
 protected:
 	virtual int_type overflow(int_type c) {
-		if (buffer_->sputc(c) != traits_type::eof()) {
+		if (buffer_ && buffer_->sputc(c) != traits_type::eof()) {
 			bytes_++;
 			return c;
 		}
 		return traits_type::eof();
 	}
 
 	virtual std::streamsize xsputn(const char* s, std::streamsize n) {
+		if (!buffer_)
+			return 0;
 		std::streamsize nput = buffer_->sputn(s, n);
 		if (nput > 0)
 			bytes_ += nput;
 		return nput;
 	}
 
+	std::streampos seekoff(std::streamoff off, std::ios_base::seekdir way,
+	    std::ios_base::openmode mode) {
+		// short-circuit for tellp
+		if ((mode & std::ios_base::out) && off == 0 && way == std::ios_base::cur)
+			return bytes_;
+		log_fatal("Seek not implemented for output stream");
+	}
+
+	std::streampos seekpos(std::streampos pos, std::ios_base::openmode mode) {
+		log_fatal("Seek not implemented for output stream");
+	}
+
 	size_t bytes_;
 
 private:
@@ -721,16 +739,6 @@ g3_ostream_to_path(std::ostream &stream, const std::string &path, bool append,
 	stream.pword(1) = sbuf;
 }
 
-size_t
-g3_ostream_count(std::ostream &stream)
-{
-	OutputStreamCounter* cbuf = static_cast<OutputStreamCounter*>(stream.rdbuf());
-	if (!cbuf)
-		log_fatal("Could not get stream counter");
-
-	return cbuf->bytes();
-}
-
 void
 g3_ostream_flush(std::ostream &stream)
 {