Changeset 70 for trunk

Timestamp:

Feb 22, 2006, 8:40:36 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixed too many files open problem.

Location:

trunk/lib

Files:

• Gnuplot.cc (modified) (1 diff)
• Gnuplot.h (modified) (2 diffs)

trunk/lib/Gnuplot.cc

@@ -4 +4 @@
 
 #include <cstdio>
+#include <string>
 #include <unistd.h>
-#include <string>
 
-#include <iostream>
 
 namespace theplu {

trunk/lib/Gnuplot.h

@@ -27 +27 @@
   /// communication with the binary.
   ///
-  /// Temporary files are created in directory /tmp. These temporaru
+  /// Temporary files are created in directory /tmp. These temporary
   /// files are removed on a normal program exit.
   ///
@@ -143 +143 @@
       assert(plotcmd=="plot" || plotcmd=="replot");
       char name[]="/tmp/svnstatXXXXXX";
-      if (mkstemp(name) == -1){
+      int fd=mkstemp(name); // mkstemp return a file descriptor
+      if (fd == -1)
         throw GnuplotException(std::string("Failed to get unique filename: ") +
                                name);
-      }
+      // Jari would like to do something like 'std::ofstream tmp(fd);'
+      // but has to settle for (which is stupid since the file is
+      // already open for writing.
       std::ofstream tmp(name);
-      if (tmp.bad())
-        throw GnuplotException(std::string("Failed to create file: ") + name);
-      
-      for (size_t i = 0; i<y.size() && (i<x.size() || x.empty()); ++i ){
+      for (size_t i = 0; i<y.size() && (i<x.size() || x.empty()); ++i )
         if (x.empty())
           tmp << y[i] << '\n';
         else
           tmp << x[i] << '\t' << y[i] << '\n';
-      }
+      // Jari, here the stupidity goes beyond everything - the
+      // ofstream must be closed as well as the file descriptor. If
+      // not the program will exhaust the availabe number of
+      // simultaneous open files.
       tmp.close();
+      close(fd);
+
       std::string cmdstring(plotcmd + " '" + name + "' u 1:2 title '" + 
                               linetitle_ + "' with " + linestyle_ + "\n");