Changeset b9a4230bc7f65c1268a1569d08ffc92d1074bc68

Timestamp:

08/16/09 01:38:33 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1250386713 +0000

git-parent:

[d28cd24a4ee6fb5b897aa9c5c17082587b6fb54b]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1250386713 +0000

Message:

first whack at using fcntl everywhere. Heads up, a lot could break. resf #167.

Files:

• src/eventer/eventer.c (modified) (2 diffs)
• src/eventer/eventer.h (modified) (1 diff)
• src/modules/collectd.c (modified) (3 diffs)
• src/modules/external.c (modified) (2 diffs)
• src/modules/lua_noit.c (modified) (2 diffs)
• src/modules/ping_icmp.c (modified) (3 diffs)
• src/modules/ssh2.c (modified) (4 diffs)
• src/noit_console.c (modified) (2 diffs)
• src/noit_jlog_listener.c (modified) (2 diffs)
• src/noit_listener.c (modified) (4 diffs)
• src/noit_listener.h (modified) (1 diff)
• src/noit_livestream_listener.c (modified) (2 diffs)
• src/noitd.c (modified) (1 diff)
• src/stratcon_iep.c (modified) (1 diff)
• src/stratcon_jlog_streamer.c (modified) (2 diffs)
• src/stratcond.c (modified) (1 diff)

src/eventer/eventer.c

@@ -34 +34 @@
-#include "eventer/eventer.h"
-#include "utils/noit_hash.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
-
-eventer_t eventer_alloc() {
@@ -57 +60 @@
-void eventer_free(eventer_t e) {
-  free(e);
+}
+
+int eventer_set_fd_nonblocking(int fd) {
+  int flags;
+  if(((flags = fcntl(fd, F_GETFL, 0)) == -1) ||
+     (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1))
+    return -1;
+  return 0;
+}
+int eventer_set_fd_blocking(int fd) {
+  int flags;
+  if(((flags = fcntl(fd, F_GETFL, 0)) == -1) ||
+     (fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == -1))
+    return -1;
+  return 0;
-}
-

src/eventer/eventer.h

@@ -142 +142 @@
-API_EXPORT(int) eventer_get_epoch(struct timeval *epoch);
-
+/* Helpers to set sockets non-blocking / blocking */
+API_EXPORT(int) eventer_set_fd_nonblocking(int fd);
+API_EXPORT(int) eventer_set_fd_blocking(int fd);
+
-#endif

src/modules/collectd.c

@@ -1436 +1436 @@
-  collectd_mod_config_t *conf;
-  conf = noit_module_get_userdata(self);
-  socklen_t on;
-  int portint = 0;
-  struct sockaddr_in skaddr;
@@ -1486 +1485 @@
-      noitL(noit_error, "Cannot get sndbuf size: %s\n", strerror(errno));
-    */
-
-
+
-      close(conf->ipv4_fd);
-      conf->ipv4_fd = -1;
@@ -1522 +1520 @@
-  }
-  else {
-
-
+
-      close(conf->ipv6_fd);
-      conf->ipv6_fd = -1;

src/modules/external.c

@@ -39 +39 @@
-#include <fcntl.h>
-#include <assert.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
-#ifdef HAVE_SYS_WAIT_H
@@ -378 +377 @@
-  /* Now the parent must set its bits non-blocking, the child need not */
-  if(data->child != 0) {
-    long on = 1;
-    /* in the parent */
-ioctl(data->pipe_e2n[0], FIONBIO, &on
+eventer_set_fd_nonblocking(data->pipe_e2n[0]
-      close(data->pipe_n2e[1]);
-      close(data->pipe_e2n[0]);

src/modules/lua_noit.c

@@ -529 +529 @@
-  struct nl_slcl *cl;
-  noit_lua_check_info_t *ci;
-n, o
+
-  int fd;
-  eventer_t e;
@@ -538 +538 @@
-    return 1;
-  }
-
-
+
-    close(fd);
-    lua_pushnil(L);

src/modules/ping_icmp.c

@@ -38 +38 @@
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
@@ -301 +300 @@
-      noitL(noit_error, "Cannot get sndbuf size: %s\n", strerror(errno));
-
-
-
+
-      close(data->ipv4_fd);
-      data->ipv4_fd = -1;
@@ -326 +324 @@
-  }
-  else {
-
-
+
-      close(data->ipv6_fd);
-      data->ipv6_fd = -1;

src/modules/ssh2.c

@@ -118 +118 @@
-                              struct timeval *now) {
-  int i;
-  long on;
-  const char *fingerprint;
-  ssh2_check_info_t *ci = closure;
@@ -132 +131 @@
-  switch(mask) {
-    case EVENTER_ASYNCH_WORK:
-
-
+
-        ci->timed_out = 0;
-        ci->error = strdup("socket error");
@@ -233 +231 @@
-  unsigned short ssh_port = DEFAULT_SSH_PORT;
-  const char *port_str = NULL;
-  long on;
-
-  /* We cannot be running */
@@ -257 +254 @@
-
-  /* Make it non-blocking */
-
-
+
-
-  if(noit_hash_retr_str(check->config, "port", strlen("port"),

src/noit_console.c

@@ -306 +306 @@
-int
-allocate_pty(int *master, int *slave) {
-  long on = 1;
-#ifdef HAVE_OPENPTY
-  if(openpty(master, slave, NULL, NULL, NULL)) return -1;
@@ -331 +330 @@
-  ioctl(*master, I_PUSH, "ldterm");     /* push ldterm*/
-#endif
-ioctl(*master, FIONBIO, &on
+eventer_set_fd_nonblocking(*master
-  noitL(noit_debug, "allocate_pty -> %d,%d\n", *master, *slave);
-  return 0;

src/noit_jlog_listener.c

@@ -40 +40 @@
-
-#include <unistd.h>
-#include <sys/ioctl.h>
-#define MAX_ROWS_AT_ONCE 1000
-#define DEFAULT_SECONDS_BETWEEN_BATCHES 10
@@ -144 +143 @@
-  acceptor_closure_t *ac = e->closure;
-  noit_jlog_closure_t *jcl = ac->service_ctx;
-  long off = 0;
-  char inbuff[sizeof(jlog_id)];
-
-
-
+
-
-  while(1) {

src/noit_listener.c

@@ -38 +38 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <sys/un.h>
@@ -121 +120 @@
-  conn = e->opset->accept(e->fd, &ac->remote.remote_addr, &salen, &newmask, e);
-  if(conn >= 0) {
-    socklen_t on = 1;
-    eventer_t newe;
-ioctl(conn, FIONBIO, &o
+eventer_set_fd_nonblocking(con
-      close(conn);
-      goto accept_bail;
@@ -180 +178 @@
-  int8_t family;
-  int sockaddr_len;
-on, 
+
-  listener_closure_t listener_closure;
-  eventer_t event;
@@ -225 +223 @@
-  }
-
-
-
+
-    close(fd);
-    noitL(noit_stderr, "Cannot make socket non-blocking: %s\n",

src/noit_listener.h

@@ -40 +40 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>

src/noit_livestream_listener.c

@@ -41 +41 @@
-
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-
@@ -162 +161 @@
-  acceptor_closure_t *ac = e->closure;
-  noit_livestream_closure_t *jcl = ac->service_ctx;
-  long off = 0;
-
-  /* Go into blocking mode */
-ioctl(e->fd, FIONBIO, &off
-ioctl 
+eventer_set_fd_blocking(e->fd
+
-          errno, strerror(errno));
-    goto alldone;

src/noitd.c

@@ -37 +37 @@
-#include <unistd.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <sys/mman.h>

src/stratcon_iep.c

@@ -852 +852 @@
-  }
-  /* in the parent */
-  socklen_t on = 1;
-
-  close(info->stdin_pipe[0]);
-  info->stdin_pipe[0] = -1;
-  close(info->stderr_pipe[1]);
-  info->stderr_pipe[1] = -1;
-ioctl(info->stderr_pipe[0], FIONBIO, &on
+eventer_set_fd_nonblocking(info->stderr_pipe[0]
-    goto bail;
-  }

src/stratcon_jlog_streamer.c

@@ -408 +408 @@
-  eventer_t e;
-  int rv, fd = -1;
-  long on;
-
-  /* Open a socket */
@@ -415 +414 @@
-
-  /* Make it non-blocking */
-
-
+
-
-  /* Initiate a connection */

src/stratcond.c

@@ -38 +38 @@
-#include <unistd.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-