Tree: clang-format without the include sorting

author: Marcus Müller <mmueller@gnuradio.org> 2019-08-07 21:45:12 +0200
committer: Marcus Müller <marcus@hostalia.de> 2019-08-09 23:04:28 +0200
commit: f7bbf2c1d8d780294f3e016aff239ca35eb6516e (patch)
tree: e09ab6112e02b2215b2d59ac24d3d6ea2edac745 /gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
parent: 78431dc6941e3acc67c858277dfe4a0ed583643c (diff)
1 files changed, 89 insertions, 92 deletions
diff --git a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
index 7a02fe2de8..d9eec36df4 100644
--- a/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
+++ b/gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
@@ -44,18 +44,17 @@
 
 namespace gr {
 
-  vmcircbuf_mmap_tmpfile::vmcircbuf_mmap_tmpfile (int size)
-    : gr::vmcircbuf (size)
-  {
+vmcircbuf_mmap_tmpfile::vmcircbuf_mmap_tmpfile(int size) : gr::vmcircbuf(size)
+{
 #if !defined(HAVE_MMAP)
     fprintf(stderr, "gr::vmcircbuf_mmap_tmpfile: mmap or mkstemp is not available\n");
     throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
 #else
     gr::thread::scoped_lock guard(s_vm_mutex);
 
-    if(size <= 0 || (size % gr::pagesize ()) != 0) {
-      fprintf(stderr, "gr::vmcircbuf_mmap_tmpfile: invalid size = %d\n", size);
-      throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+    if (size <= 0 || (size % gr::pagesize()) != 0) {
+        fprintf(stderr, "gr::vmcircbuf_mmap_tmpfile: invalid size = %d\n", size);
+        throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
     }
 
     int seg_fd = -1;
@@ -64,137 +63,135 @@ namespace gr {
     static int s_seg_counter = 0;
 
     // open a temporary file that we'll map in a bit later
-    while(1) {
-      snprintf(seg_name, sizeof(seg_name),
-               "%s/gnuradio-%d-%d-XXXXXX", gr::tmp_path(), getpid(), s_seg_counter);
-      s_seg_counter++;
-
-      seg_fd = open(seg_name, O_RDWR | O_CREAT | O_EXCL, 0600);
-      if(seg_fd == -1) {
-        if(errno == EEXIST) // File already exists (shouldn't happen).  Try again
-          continue;
-
-        char msg[1024];
-        snprintf(msg, sizeof (msg),
-                 "gr::vmcircbuf_mmap_tmpfile: open [%s]", seg_name);
-        perror(msg);
-        throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
-      }
-      break;
+    while (1) {
+        snprintf(seg_name,
+                 sizeof(seg_name),
+                 "%s/gnuradio-%d-%d-XXXXXX",
+                 gr::tmp_path(),
+                 getpid(),
+                 s_seg_counter);
+        s_seg_counter++;
+
+        seg_fd = open(seg_name, O_RDWR | O_CREAT | O_EXCL, 0600);
+        if (seg_fd == -1) {
+            if (errno == EEXIST) // File already exists (shouldn't happen).  Try again
+                continue;
+
+            char msg[1024];
+            snprintf(msg, sizeof(msg), "gr::vmcircbuf_mmap_tmpfile: open [%s]", seg_name);
+            perror(msg);
+            throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+        }
+        break;
     }
 
-    if(unlink (seg_name) == -1) {
-      perror("gr::vmcircbuf_mmap_tmpfile: unlink");
-      throw std::runtime_error ("gr::vmcircbuf_mmap_tmpfile");
+    if (unlink(seg_name) == -1) {
+        perror("gr::vmcircbuf_mmap_tmpfile: unlink");
+        throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
     }
 
     // We've got a valid file descriptor to a tmp file.
     // Now set it's length to 2x what we really want and mmap it in.
-    if(ftruncate (seg_fd, (off_t) 2 * size) == -1) {
-      close(seg_fd);						// cleanup
-      perror("gr::vmcircbuf_mmap_tmpfile: ftruncate (1)");
-      throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+    if (ftruncate(seg_fd, (off_t)2 * size) == -1) {
+        close(seg_fd); // cleanup
+        perror("gr::vmcircbuf_mmap_tmpfile: ftruncate (1)");
+        throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
     }
 
-    void *first_copy = mmap(0, 2 * size,
-                            PROT_READ | PROT_WRITE, MAP_SHARED,
-                            seg_fd, (off_t)0);
+    void* first_copy =
+        mmap(0, 2 * size, PROT_READ | PROT_WRITE, MAP_SHARED, seg_fd, (off_t)0);
 
-    if(first_copy == MAP_FAILED) {
-      close(seg_fd);						// cleanup
-      perror("gr::vmcircbuf_mmap_tmpfile: mmap (1)");
-      throw std::runtime_error ("gr::vmcircbuf_mmap_tmpfile");
+    if (first_copy == MAP_FAILED) {
+        close(seg_fd); // cleanup
+        perror("gr::vmcircbuf_mmap_tmpfile: mmap (1)");
+        throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
     }
 
     // unmap the 2nd half
-    if(munmap ((char *) first_copy + size, size) == -1) {
-      close(seg_fd);						// cleanup
-      perror("gr::vmcircbuf_mmap_tmpfile: munmap (1)");
-      throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+    if (munmap((char*)first_copy + size, size) == -1) {
+        close(seg_fd); // cleanup
+        perror("gr::vmcircbuf_mmap_tmpfile: munmap (1)");
+        throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
     }
 
     // map the first half into the now available hole where the
     // second half used to be.
-    void *second_copy = mmap((char*)first_copy + size, size,
-                             PROT_READ | PROT_WRITE, MAP_SHARED,
-                             seg_fd, (off_t)0);
-
-    if(second_copy == MAP_FAILED) {
-      munmap(first_copy, size);					// cleanup
-      close(seg_fd);
-      perror("gr::vmcircbuf_mmap_tmpfile: mmap(2)");
-      throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+    void* second_copy = mmap((char*)first_copy + size,
+                             size,
+                             PROT_READ | PROT_WRITE,
+                             MAP_SHARED,
+                             seg_fd,
+                             (off_t)0);
+
+    if (second_copy == MAP_FAILED) {
+        munmap(first_copy, size); // cleanup
+        close(seg_fd);
+        perror("gr::vmcircbuf_mmap_tmpfile: mmap(2)");
+        throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
     }
 
     // check for contiguity
-    if((char*)second_copy != (char*)first_copy + size) {
-      munmap(first_copy, size);					// cleanup
-      munmap(second_copy, size);
-      close(seg_fd);
-      perror("gr::vmcircbuf_mmap_tmpfile: non-contiguous second copy");
-      throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+    if ((char*)second_copy != (char*)first_copy + size) {
+        munmap(first_copy, size); // cleanup
+        munmap(second_copy, size);
+        close(seg_fd);
+        perror("gr::vmcircbuf_mmap_tmpfile: non-contiguous second copy");
+        throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
     }
 
     // cut the tmp file down to size
-    if(ftruncate (seg_fd, (off_t) size) == -1) {
-      munmap(first_copy, size);					// cleanup
-      munmap(second_copy, size);
-      close(seg_fd);
-      perror("gr::vmcircbuf_mmap_tmpfile: ftruncate (2)");
-      throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
+    if (ftruncate(seg_fd, (off_t)size) == -1) {
+        munmap(first_copy, size); // cleanup
+        munmap(second_copy, size);
+        close(seg_fd);
+        perror("gr::vmcircbuf_mmap_tmpfile: ftruncate (2)");
+        throw std::runtime_error("gr::vmcircbuf_mmap_tmpfile");
     }
 
-    close(seg_fd);	// fd no longer needed.  The mapping is retained.
+    close(seg_fd); // fd no longer needed.  The mapping is retained.
 
     // Now remember the important stuff
 
     d_base = (char*)first_copy;
     d_size = size;
 #endif
-  }
+}
 
-  vmcircbuf_mmap_tmpfile::~vmcircbuf_mmap_tmpfile()
-  {
+vmcircbuf_mmap_tmpfile::~vmcircbuf_mmap_tmpfile()
+{
 #if defined(HAVE_MMAP)
     gr::thread::scoped_lock guard(s_vm_mutex);
 
-    if(munmap(d_base, 2 * d_size) == -1) {
-      perror("gr::vmcircbuf_mmap_tmpfile: munmap(2)");
+    if (munmap(d_base, 2 * d_size) == -1) {
+        perror("gr::vmcircbuf_mmap_tmpfile: munmap(2)");
     }
 #endif
-  }
+}
 
-  // ----------------------------------------------------------------
-  //			The factory interface
-  // ----------------------------------------------------------------
+// ----------------------------------------------------------------
+//			The factory interface
+// ----------------------------------------------------------------
 
-  gr::vmcircbuf_factory *vmcircbuf_mmap_tmpfile_factory::s_the_factory = 0;
+gr::vmcircbuf_factory* vmcircbuf_mmap_tmpfile_factory::s_the_factory = 0;
 
-  gr::vmcircbuf_factory *
-  vmcircbuf_mmap_tmpfile_factory::singleton()
-  {
-    if(s_the_factory)
-      return s_the_factory;
+gr::vmcircbuf_factory* vmcircbuf_mmap_tmpfile_factory::singleton()
+{
+    if (s_the_factory)
+        return s_the_factory;
 
     s_the_factory = new gr::vmcircbuf_mmap_tmpfile_factory();
     return s_the_factory;
-  }
+}
 
-  int
-  vmcircbuf_mmap_tmpfile_factory::granularity()
-  {
-    return gr::pagesize();
-  }
+int vmcircbuf_mmap_tmpfile_factory::granularity() { return gr::pagesize(); }
 
-  gr::vmcircbuf *
-  vmcircbuf_mmap_tmpfile_factory::make(int size)
-  {
+gr::vmcircbuf* vmcircbuf_mmap_tmpfile_factory::make(int size)
+{
     try {
-      return new vmcircbuf_mmap_tmpfile(size);
-    }
-    catch (...) {
-      return 0;
+        return new vmcircbuf_mmap_tmpfile(size);
+    } catch (...) {
+        return 0;
     }
-  }
+}
 
 } /* namespace gr */
author	Marcus Müller <mmueller@gnuradio.org>	2019-08-07 21:45:12 +0200
committer	Marcus Müller <marcus@hostalia.de>	2019-08-09 23:04:28 +0200
commit	f7bbf2c1d8d780294f3e016aff239ca35eb6516e (patch)
tree	e09ab6112e02b2215b2d59ac24d3d6ea2edac745 /gnuradio-runtime/lib/vmcircbuf_mmap_tmpfile.cc
parent	78431dc6941e3acc67c858277dfe4a0ed583643c (diff)