autoload: move socket material into socket module.

* autoload.c (sock_set_entries, sock_instantiate): Functions
removed from here.
(autoload_init): autoload_reg call for above functions removed
from here.
(autoload_intern): New function, wrapper for intern_only.
sock_set_entries uses intern_only which is static, so we need
to expose this.

* autoload.h (autoload_intern): Declared.

* socket.c (sock_set_entries, sock_instantiate): Functions
moved here. intern_only call replaced with autoload_intern.
(sock_load_init): Function removed: body moved into
sock_instantiate, which no longer calls sock_load_init.

4 files changed, 70 insertions, 72 deletions

diff --git a/autoload.c b/autoload.c
index 33029170..bfe53a51 100644
--- a/autoload.c
+++ b/autoload.c
@@ -38,7 +38,6 @@
 #include "gc.h"
 #include "debug.h"
 #include "txr.h"
-#include "socket.h"
 #include "autoload.h"
 
 int opt_dbg_autoload;
@@ -331,69 +330,6 @@ static val yield_instantiate(void)
   return nil;
 }
 
-#if HAVE_SOCKETS
-static val sock_set_entries(val fun)
-{
-  val sname[] = {
-    lit("sockaddr"), lit("sockaddr-in"), lit("sockaddr-in6"),
-    lit("sockaddr-un"), lit("addrinfo"),
-    nil
-  };
-  val vname[] = {
-    lit("af-unspec"), lit("af-unix"), lit("af-inet"), lit("af-inet6"),
-    lit("sock-stream"), lit("sock-dgram"),
-    lit("inaddr-any"), lit("inaddr-loopback"),
-    lit("in6addr-any"), lit("in6addr-loopback"),
-    lit("sock-nonblock"), lit("sock-cloexec"),
-    lit("ai-passive"), lit("ai-canonname"), lit("ai-numerichost"),
-    lit("ai-v4mapped"), lit("ai-all"), lit("ai-addrconfig"),
-    lit("ai-numericserv"), lit("sol-socket"), lit("ipproto-ip"),
-    lit("ipproto-ipv6"), lit("ipproto-tcp"), lit("ipproto-udp"),
-    lit("so-acceptconn"), lit("so-broadcast"), lit("so-debug"),
-    lit("so-dontroute"), lit("so-error"), lit("so-keepalive"),
-    lit("so-linger"), lit("so-oobinline"), lit("so-rcvbuf"),
-    lit("so-rcvlowat"), lit("so-rcvtimeo"), lit("so-reuseaddr"),
-    lit("so-sndbuf"), lit("so-sndlowat"), lit("so-sndtimeo"),
-    lit("so-type"), lit("ipv6-join-group"), lit("ipv6-leave-group"),
-    lit("ipv6-multicast-hops"), lit("ipv6-multicast-if"),
-    lit("ipv6-multicast-loop"), lit("ipv6-unicast-hops"),
-    lit("ipv6-v6only"), lit("tcp-nodelay"),
-    nil
-  };
-  val name[] = {
-    lit("getaddrinfo"),
-    lit("str-inaddr"), lit("str-in6addr"),
-    lit("str-inaddr-net"), lit("str-in6addr-net"),
-    lit("inaddr-str"), lit("in6addr-str"),
-    lit("shut-rd"), lit("shut-wr"), lit("shut-rdwr"),
-    lit("open-socket"), lit("open-socket-pair"),
-    lit("sock-bind"), lit("sock-connect"), lit("sock-listen"),
-    lit("sock-accept"), lit("sock-shutdown"), lit("open-socket"),
-    lit("open-socket-pair"), lit("sock-send-timeout"), lit("sock-recv-timeout"),
-    lit("sock-opt"), lit("sock-set-opt"),
-    nil
-  };
-  val name_noload[] = {
-    lit("family"), lit("addr"), lit("port"), lit("flow-info"),
-    lit("scope-id"), lit("prefix"), lit("path"), lit("flags"), lit("socktype"),
-    lit("protocol"), lit("canonname"), nil
-  };
-  autoload_set(al_struct, sname, fun);
-  autoload_set(al_var, vname, fun);
-  autoload_set(al_fun, name, fun);
-  intern_only(name_noload);
-  return nil;
-}
-
-static val sock_instantiate(void)
-{
-  sock_load_init();
-  load(scat2(stdlib_path, lit("socket")));
-  return nil;
-}
-
-#endif
-
 static val awk_set_entries(val fun)
 {
   val sys_sname[] = {
@@ -1002,9 +938,6 @@ void autoload_init(void)
   autoload_reg(except_instantiate, except_set_entries);
   autoload_reg(type_instantiate, type_set_entries);
   autoload_reg(yield_instantiate, yield_set_entries);
-#if HAVE_SOCKETS
-  autoload_reg(sock_instantiate, sock_set_entries);
-#endif
   autoload_reg(awk_instantiate, awk_set_entries);
   autoload_reg(build_instantiate, build_set_entries);
   autoload_reg(trace_instantiate, trace_set_entries);
@@ -1093,3 +1026,8 @@ val autoload_try_keyword(val sym)
 {
   return autoload_try(al_key, sym);
 }
+
+void autoload_intern(val *namearray)
+{
+  intern_only(namearray);
+}
diff --git a/autoload.h b/autoload.h
index 7097583b..f648f3f5 100644
--- a/autoload.h
+++ b/autoload.h
@@ -41,3 +41,4 @@ val autoload_try_keyword(val sym);
 void autoload_set(al_ns_t ns, val *name, val fun);
 val autoload_reg(val (*instantiate)(void),
                  val (*set_entries)(val));
+void autoload_intern(val *namearray);
diff --git a/socket.c b/socket.c
index 56f6773c..e7695c1e 100644
--- a/socket.c
+++ b/socket.c
@@ -64,6 +64,8 @@
 #include "sysif.h"
 #include "itypes.h"
 #include "ffi.h"
+#include "txr.h"
+#include "autoload.h"
 #include "socket.h"
 
 #define MIN(A, B) ((A) < (B) ? (A) : (B))
@@ -1212,13 +1214,60 @@ static val sock_set_opt(val sock, val level, val option, val value,
   }
 }
 
-void sock_init(void)
+static val sock_set_entries(val fun)
 {
-  ffi_typedef(intern(lit("socklen-t"), user_package),
-              ffi_type_by_size(convert(socklen_t, -1) > 0, sizeof (socklen_t)));
+  val sname[] = {
+    lit("sockaddr"), lit("sockaddr-in"), lit("sockaddr-in6"),
+    lit("sockaddr-un"), lit("addrinfo"),
+    nil
+  };
+  val vname[] = {
+    lit("af-unspec"), lit("af-unix"), lit("af-inet"), lit("af-inet6"),
+    lit("sock-stream"), lit("sock-dgram"),
+    lit("inaddr-any"), lit("inaddr-loopback"),
+    lit("in6addr-any"), lit("in6addr-loopback"),
+    lit("sock-nonblock"), lit("sock-cloexec"),
+    lit("ai-passive"), lit("ai-canonname"), lit("ai-numerichost"),
+    lit("ai-v4mapped"), lit("ai-all"), lit("ai-addrconfig"),
+    lit("ai-numericserv"), lit("sol-socket"), lit("ipproto-ip"),
+    lit("ipproto-ipv6"), lit("ipproto-tcp"), lit("ipproto-udp"),
+    lit("so-acceptconn"), lit("so-broadcast"), lit("so-debug"),
+    lit("so-dontroute"), lit("so-error"), lit("so-keepalive"),
+    lit("so-linger"), lit("so-oobinline"), lit("so-rcvbuf"),
+    lit("so-rcvlowat"), lit("so-rcvtimeo"), lit("so-reuseaddr"),
+    lit("so-sndbuf"), lit("so-sndlowat"), lit("so-sndtimeo"),
+    lit("so-type"), lit("ipv6-join-group"), lit("ipv6-leave-group"),
+    lit("ipv6-multicast-hops"), lit("ipv6-multicast-if"),
+    lit("ipv6-multicast-loop"), lit("ipv6-unicast-hops"),
+    lit("ipv6-v6only"), lit("tcp-nodelay"),
+    nil
+  };
+  val name[] = {
+    lit("getaddrinfo"),
+    lit("str-inaddr"), lit("str-in6addr"),
+    lit("str-inaddr-net"), lit("str-in6addr-net"),
+    lit("inaddr-str"), lit("in6addr-str"),
+    lit("shut-rd"), lit("shut-wr"), lit("shut-rdwr"),
+    lit("open-socket"), lit("open-socket-pair"),
+    lit("sock-bind"), lit("sock-connect"), lit("sock-listen"),
+    lit("sock-accept"), lit("sock-shutdown"), lit("open-socket"),
+    lit("open-socket-pair"), lit("sock-send-timeout"), lit("sock-recv-timeout"),
+    lit("sock-opt"), lit("sock-set-opt"),
+    nil
+  };
+  val name_noload[] = {
+    lit("family"), lit("addr"), lit("port"), lit("flow-info"),
+    lit("scope-id"), lit("prefix"), lit("path"), lit("flags"), lit("socktype"),
+    lit("protocol"), lit("canonname"), nil
+  };
+  autoload_set(al_struct, sname, fun);
+  autoload_set(al_var, vname, fun);
+  autoload_set(al_fun, name, fun);
+  autoload_intern(name_noload);
+  return nil;
 }
 
-void sock_load_init(void)
+static val sock_instantiate(void)
 {
   sockaddr_in_s = intern(lit("sockaddr-in"), user_package);
   sockaddr_in6_s = intern(lit("sockaddr-in6"), user_package);
@@ -1315,8 +1364,19 @@ void sock_load_init(void)
   reg_varl(intern(lit("tcp-nodelay"), user_package), num_fast(TCP_NODELAY));
 
   fill_stream_ops(&dgram_strm_ops);
+
   dgram_strm_ops.get_sock_family = dgram_get_sock_family;
   dgram_strm_ops.get_sock_type = dgram_get_sock_type;
   dgram_strm_ops.get_sock_peer = dgram_get_sock_peer;
   dgram_strm_ops.set_sock_peer = dgram_set_sock_peer;
+
+  load(scat2(stdlib_path, lit("socket")));
+  return nil;
+}
+
+void sock_init(void)
+{
+  ffi_typedef(intern(lit("socklen-t"), user_package),
+              ffi_type_by_size(convert(socklen_t, -1) > 0, sizeof (socklen_t)));
+  autoload_reg(sock_instantiate, sock_set_entries);
 }
diff --git a/socket.h b/socket.h
index 98f567b8..cd8e7dad 100644
--- a/socket.h
+++ b/socket.h
@@ -27,4 +27,3 @@
  */
 
 void sock_init(void);
-void sock_load_init(void);