X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=dgram%2Fdgram.c;h=b2661a4fe82611792a359e02fb25a12ee3c713ff;hp=a2a2f974d7bce0655d52858f2ade07fbe8b5a29f;hb=2ca964a890a31ab4f14f17cfbd359271cd8c4ea3;hpb=ceb4860abfe091be1ff68795d820ea4c9afc4f4a

diff --git a/dgram/dgram.c b/dgram/dgram.c
index a2a2f97..b2661a4 100644
--- a/dgram/dgram.c
+++ b/dgram/dgram.c
@@ -13,62 +13,47 @@
 #include "hbytes.h"
 
 typedef struct DgramSocket {
-  int ix, fd, script_llength;
+  int ix; /* first ! */
+  int fd;
   Tcl_Interp *ip;
-  Tcl_Obj *script;
+  ScriptToInvoke script;
   void *addr_buf, *msg_buf;
   int addr_buflen, msg_buflen;
 } DgramSocket;
 
-static int n_socks;
-static DgramSocket **socks;
-
-static int sockfail(Tcl_Interp *ip, int fd, const char *m) {
-  int e;
-  e= errno;
-  close(fd);
-  return posixerr(ip,e,m);
-}
+IdDataTable dgram_socks= { "dgramsock" };
 
 int do_dgram_socket_create(ClientData cd, Tcl_Interp *ip,
-			  SockAddr_Value local, DgramSockID *sock_r) {
-  int fd, al, r, sockix;
+			   SockAddr_Value local, void **sock_r) {
+  int fd, al, r;
   DgramSocket *sock;
   const struct sockaddr *sa;
 
-  for (sockix=0; sockix<n_socks && socks[sockix]; sockix++);
-  if (sockix>=n_socks) {
-    n_socks += 2;
-    n_socks *= 2;
-    socks= (void*)Tcl_Realloc((void*)socks, n_socks*sizeof(*socks));
-    while (sockix<n_socks) socks[sockix++]=0;
-    sockix--;
-  }
-
   sa= sockaddr_addr(&local);
   al= sockaddr_len(&local);
 
   fd= socket(sa->sa_family, SOCK_DGRAM, 0);
   if (fd<0) return posixerr(ip,errno,"socket");
-  r= bind(fd, sa, al);  if (r) return sockfail(ip,fd,"bind");
-  r= setnonblock(fd, 1);  if (r) return sockfail(ip,fd,"setnonblock");
+  r= bind(fd, sa, al);  if (r) return newfdposixerr(ip,fd,"bind");
+  r= setnonblock(fd, 1);  if (r) return newfdposixerr(ip,fd,"setnonblock");
 
-  socks[sockix]= sock= TALLOC(sizeof(DgramSocket));
+  sock= TALLOC(sizeof(DgramSocket));
+  sock->ix= -1;
   sock->fd= fd;
-  sock->ix= sockix;
-  sock->script= 0;
   sock->addr_buflen= al+1;
   sock->addr_buf= TALLOC(sock->addr_buflen);
   sock->msg_buflen= 0;
   sock->msg_buf= 0;
+  scriptinv_init(&sock->script);
 
   *sock_r= sock;
   return TCL_OK;
 }
 
 int do_dgram_socket_transmit(ClientData cd, Tcl_Interp *ip,
-			     DgramSocket *sock, HBytes_Value data,
+			     void *sock_v, HBytes_Value data,
 			     SockAddr_Value remote) {
+  DgramSocket *sock= sock_v;
   int l, r;
 
   r= sendto(sock->fd,
@@ -76,31 +61,29 @@ int do_dgram_socket_transmit(ClientData cd, Tcl_Interp *ip,
 	    0,
 	    sockaddr_addr(&remote), sockaddr_len(&remote));
   if (r==-1) return posixerr(ip,errno,"sendto");
-  else if (r!=l) return staticerr(ip,"sendto gave wrong answer");
+  else if (r!=l) return staticerr(ip,"sendto gave wrong answer",0);
   return TCL_OK;
 }
 
 static void cancel(DgramSocket *sock) {
-  if (sock->script) {
+  if (sock->script.obj) {
+    scriptinv_cancel(&sock->script);
     Tcl_DeleteFileHandler(sock->fd);
-    Tcl_DecrRefCount(sock->script);
-    sock->script= 0;
   }
 }
 
 static void recv_call(ClientData sock_cd, int mask) {
   DgramSocket *sock= (void*)sock_cd;
-  Tcl_Interp *ip= sock->ip;
-  int sz, rc, i, peek;
+  Tcl_Interp *ip= sock->script.ip;
+  int sz, rc, peek;
   HBytes_Value message_val;
   SockAddr_Value peer_val;
-  Tcl_Obj *args[3], *invoke;
+  Tcl_Obj *args[3];
   struct msghdr mh;
   struct iovec iov;
 
   hbytes_empty(&message_val);
   sockaddr_clear(&peer_val);
-  invoke=0; for (i=0; i<3; i++) args[i]=0;
 
   mh.msg_iov= &iov;
   mh.msg_iovlen= 1;
@@ -118,7 +101,11 @@ static void recv_call(ClientData sock_cd, int mask) {
     iov.iov_len= sock->msg_buflen;
 
     sz= recvmsg(sock->fd, &mh, peek);
-    if (sz==-1) { rc=0; goto x_rc; }
+    if (sz==-1) {
+      if (errno == EAGAIN || errno == EWOULDBLOCK) rc=0;
+      else rc= posixerr(ip,errno,"recvmsg");
+      goto x_rc;
+    }
 
     assert(mh.msg_namelen < sock->addr_buflen);
 
@@ -139,48 +126,34 @@ static void recv_call(ClientData sock_cd, int mask) {
 
   args[0]= ret_hb(ip, message_val);  hbytes_empty(&message_val);
   args[1]= ret_sockaddr(ip, peer_val);  sockaddr_clear(&peer_val);
-  args[2]= ret_sockid(ip, sock);
-  for (i=0; i<3; i++) Tcl_IncrRefCount(args[i]);
-
-  invoke= Tcl_DuplicateObj(sock->script);
-  Tcl_IncrRefCount(invoke);
-
-  rc= Tcl_ListObjReplace(ip,invoke,sock->script_llength,0,3,args);
-  if (rc) goto x_rc;
-
-  rc= Tcl_EvalObjEx(ip,invoke,TCL_EVAL_GLOBAL|TCL_EVAL_DIRECT);
-
-  for (i=0; i<3; i++) Tcl_DecrRefCount(args[i]);
-  Tcl_DecrRefCount(invoke);
-
-  hbytes_free(&message_val);
-  sockaddr_free(&peer_val);
+  args[2]= ret_iddata(ip, sock, &dgram_socks);
+  scriptinv_invoke(&sock->script,3,args);
 
+  rc= 0;
+  
 x_rc:
   if (rc)
     Tcl_BackgroundError(ip);
 }
 
 int do_dgram_socket_on_receive(ClientData cd, Tcl_Interp *ip,
-			       DgramSocket *sock, Tcl_Obj *script) {
+			       void *sock_v, Tcl_Obj *newscript) {
+  DgramSocket *sock= sock_v;
   int rc;
   
-  if (script) {
-    rc= Tcl_ListObjLength(ip, script, &sock->script_llength);
+  cancel(sock);
+  
+  if (newscript) {
+    rc= scriptinv_set(&sock->script, ip, newscript);
     if (rc) return rc;
   }
   
-  cancel(sock);
-  if (script) {
-    Tcl_IncrRefCount(script);
-    sock->script= script;
-    sock->ip= ip;
-  }
   Tcl_CreateFileHandler(sock->fd, TCL_READABLE, recv_call, sock);
   return TCL_OK;
 }
 
-int do_dgram_socket_close(ClientData cd, Tcl_Interp *ip, DgramSocket *sock) {
+int do_dgram_socket_close(ClientData cd, Tcl_Interp *ip, void *sock_v) {
+  DgramSocket *sock= sock_v;
   int sockix;
   cancel(sock);
   close(sock->fd); /* nothing useful to be done with errors */
@@ -188,69 +161,6 @@ int do_dgram_socket_close(ClientData cd, Tcl_Interp *ip, DgramSocket *sock) {
   TFREE(sock->addr_buf);
   TFREE(sock->msg_buf);
   TFREE(sock);
-  socks[sockix]= 0;
-  return TCL_OK;
-}
-
-/* Arg parsing */
-
-int pat_sockid(Tcl_Interp *ip, Tcl_Obj *o, DgramSocket **val) {
-  int rc, sockix;
-  DgramSocket *sock;
-  
-  rc= Tcl_ConvertToType(ip,o,&sockid_type);
-  if (rc) return rc;
-
-  sockix= o->internalRep.longValue;
-  if (sockix >= n_socks || !(sock= socks[sockix]))
-    return staticerr(ip,"dgram socket not open");
-
-  assert(socks[sockix]->ix == sockix);
-
-  *val= sock;
+  dgram_socks.a[sockix]= 0;
   return TCL_OK;
 }
-
-Tcl_Obj *ret_sockid(Tcl_Interp *ip, DgramSocket *val) {
-  Tcl_Obj *o;
-
-  o= Tcl_NewObj();
-  Tcl_InvalidateStringRep(o);
-  o->internalRep.longValue= val->ix;
-  o->typePtr= &sockid_type;
-  return o;
-}
-
-static void sockid_t_free(Tcl_Obj *o) { }
-
-static void sockid_t_dup(Tcl_Obj *src, Tcl_Obj *dup) {
-  dup->internalRep= src->internalRep;
-}
-
-static void sockid_t_ustr(Tcl_Obj *o) {
-  char buf[100];
-  int l;
-
-  snprintf(buf,sizeof(buf),"dgramsock%d", (int)o->internalRep.longValue);
-  l= o->length= strlen(buf);
-  o->bytes= TALLOC(l+1);
-  strcpy(o->bytes, buf);
-}
-
-static int sockid_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
-  unsigned long ul;
-  char *ep, *str;
-  
-  str= Tcl_GetStringFromObj(o,0);
-  if (memcmp(str,"dgramsock",9)) return staticerr(ip,"bad dgram socket id");
-  errno=0; ul=strtoul(str+9,&ep,10);
-  if (errno || *ep) return staticerr(ip,"bad dgram socket id number");
-  if (ul > INT_MAX) return staticerr(ip,"out of range dgram socket id");
-  o->internalRep.longValue= ul;
-  return TCL_OK;
-}
-
-Tcl_ObjType sockid_type = {
-  "sockid-nearly",
-  sockid_t_free, sockid_t_dup, sockid_t_ustr, sockid_t_sfa
-};