Diff of /src/send.cc [05cccf] .. [0c456c] Maximize Restore

  Switch to side-by-side view

--- a/src/send.cc
+++ b/src/send.cc
@@ -1,270 +1,76 @@
-/*
+// Copyright (C) 2010 Olaf Till <olaf.till@uni-jena.de>
 
-Copyright (C) 2002 Hayato Fujiwara
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; If not, see <http://www.gnu.org/licenses/>.
-
-*/
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <octave/oct.h>
-#include <map>
+#include <octave/load-save.h>
+#include <octave/ls-oct-binary.h>
+#include <octave/oct-stream.h>
 
-#include "defun-dld.h"
-#include "dirfns.h"
-#include "error.h"
-#include "help.h"
-#include "oct-map.h"
-#include "systime.h"
-#include "ov.h"
-#include "oct-obj.h"
-#include "utils.h"
-#include "oct-env.h"
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <netdb.h>
-#include <unistd.h>
-
-// SSIZE_MAX might be for 64-bit. Limit to 2^31-1
-#define BUFF_SIZE 2147483647
-
-// COMM
-
-DEFUN_DLD (send, args, ,
-  "send (X,sockets)\n\
+DEFUN_DLD (send, args, , "send (X, sockets)\n\
 \n\
-Send the variable 'x' to the computers specified by matrix 'sockets'.")
+Send the variable 'X' to the computers specified by matrix 'sockets'\n.")
 {
   octave_value retval;
-  
-  typedef std::map<std::string, octave_value_list>::iterator iterator;
-  typedef std::map<std::string, octave_value_list>::const_iterator const_iterator;
 
-  if(args.length () ==2)
+  if (args.length () != 2)
     {
-      octave_value val=args(0);
-      Matrix sock_m=args(1).matrix_value();
-      int sock,i,k,error_code,nl;
-      int nsock=sock_m.rows();
-      int type_id=0; //=val.type_id();
+      error ("two arguments required\n");
 
-      if((int)sock_m.data()[0]==0){
-	int num,pid;
-	struct pollfd *pollfd;
-	pollfd=(struct pollfd *)malloc(nsock*sizeof(struct pollfd));
-	for(i=0;i<nsock;i++){
-	  sock=(int)sock_m.data()[i+nsock];
-	  pollfd[i].fd=sock;
-	  pollfd[i].events=0;
-	  pollfd[i].events=POLLIN|POLLERR|POLLHUP;
+      return retval;
+    }
+
+  Matrix sockets = args(1).matrix_value ();
+
+  if (error_state)
+    return retval;
+
+  int rows = sockets.rows ();
+
+  double sid;
+
+  for (int id = 0; id < rows; id++)
+    {
+      if ((sid = sockets(id, 0)) != 0)
+	{
+	  octave_stream os = octave_stream_list::lookup
+	    (octave_value (sid), "send");
+
+	  if (error_state)
+	    {
+	      error ("no valid stream id\n");
+
+	      return retval;
+	    }
+	  if (! os.is_open ())
+	    {
+	      error ("stream not open\n");
+
+	      return retval;
+	    }
+
+	  std::ostream *tps = os.output_stream ();
+	  std::ostream& ps = *tps;
+
+	  write_header (ps, LS_BINARY);
+
+	  save_binary_data (ps, args(0), "a", "", false, false);
+
+	  ps.flush ();
 	}
-	
-	num=poll(pollfd,nsock,0);
-	if(num){
-	  for(k=0;k<nsock;k++){
-	    if(pollfd[k].revents && (pollfd[k].fd !=0)){
-	      sockaddr_in r_addr;
-	      struct hostent *hehe;
-	      socklen_t len = sizeof(r_addr);
-	      getpeername(pollfd[k].fd, (sockaddr*)&r_addr, &len );
-	      hehe=gethostbyaddr((char *)&r_addr.sin_addr.s_addr,sizeof(r_addr.sin_addr), AF_INET);
-	      
-	      if(pollfd[k].revents&POLLIN){
-		pid=getpid();
-		read(pollfd[k].fd,&nl,sizeof(int));
-		error_code=ntohl(nl);
-		write(pollfd[k].fd,&nl,sizeof(int));
-		error("error occurred in %s\n\tsee %s:/tmp/octave_error-%s_%5d.log for detail",hehe->h_name,hehe->h_name,hehe->h_name,pid );
-	      }
-	      if(pollfd[k].revents&POLLERR){
-		error("Error condition - %s",hehe->h_name );
-	      }
-	      if(pollfd[k].revents&POLLHUP){
-		error("Hung up - %s",hehe->h_name );
-	      }
-	    }
-	  }
-	}
-      }
+    }
 
-      if(val.is_real_matrix() && !(val.is_char_matrix()))
-	{
-	  Matrix m=val.matrix_value();
-	  int row=m.rows();
-	  int col=m.columns();
-	  int length=0,count,r_len;
-	  
-	  const double *tmp=m.data();
-	  type_id=3;
-	  for (i=0;i<nsock;i++){
-	    sock=(int)sock_m.data()[i];
-	    if(sock!=0){
-	      nl=htonl(type_id);
-	      write(sock,&nl,sizeof(int));
-	      nl=htonl(row);
-	      write(sock,&nl,sizeof(int));
-	      nl=htonl(col);
-	      write(sock,&nl,sizeof(int));
-	      length=sizeof(double)*col*row;
-	      errno=0;
-	      count=0;
-	      r_len=BUFF_SIZE;
-	      while(count <length){
-		if((length-count) < BUFF_SIZE)
-		  r_len=length-count;
-		count +=write(sock,(tmp+(count/sizeof(double))),r_len);
-	      }
-
-	    //	      write(sock,m.data(),length);
-	    }
-	  }
-	  
-	}
-      else if(val.is_real_scalar())
-	{
-	  double d=val.double_value();
-	  int length=sizeof(d);
-	  
-	  type_id=1;
-	  for (i=0;i<nsock;i++){
-	    sock=(int)sock_m.data()[i];
-	    if(sock!=0){
-	      nl=htonl(type_id);
-	      write(sock,&nl,sizeof(int));
-	      write(sock,&d,length);
-	    }
-	  }
-	}
-      else if(val.is_complex_matrix())
-	{
-	  ComplexMatrix m=val.complex_matrix_value();
-	  int row=m.rows();
-	  int col=m.columns();
-	  int length=0,count,r_len;
-	  
-	  type_id=4;
-	  const Complex *tmp=m.data();
-	  for (i=0;i<nsock;i++){
-	    sock=(int)sock_m.data()[i];
-	    if(sock!=0){
-	      nl=htonl(type_id);
-	      write(sock,&nl,sizeof(int));
-	      nl=htonl(row);
-	      write(sock,&nl,sizeof(int));
-	      nl=htonl(col);
-	      write(sock,&nl,sizeof(int));
-	      length=sizeof(Complex)*col*row;
-	      count=0;
-	      r_len=BUFF_SIZE;
-	      while(count <length){
-		if((length-count) < BUFF_SIZE)
-		  r_len=length-count;
-		count +=write(sock,(tmp+(count/sizeof(Complex))),r_len);
-	      }
-	      //	      write(sock,m.data(),length);
-	    }
-	  }
-	}
-      else if(val.is_complex_scalar())
-	{
-	  Complex cx=val.complex_value();
-	  int length=sizeof(cx);
-	  
-	  type_id=2;
-	  for (i=0;i<nsock;i++){
-	    sock=(int)sock_m.data()[i];
-	    if(sock!=0){
-	      nl=htonl(type_id);
-	      write(sock,&nl,sizeof(int));
-	      write(sock,&cx,length);
-	    }
-	  }
-	}
-      else if(val.is_char_matrix())
-	{
-	  int row=val.rows();
-	  int col=val.columns();
-	  int length=sizeof(char)*row*col,count,r_len;
-	  charMatrix cmx=val.char_matrix_value();
-	  
-	  type_id=6;
-	  const char *tmp=cmx.data();
-	  for (i=0;i<nsock;i++){
-	    sock=(int)sock_m.data()[i];
-	    if(sock!=0){
-	      nl=htonl(type_id);
-	      write(sock,&nl,sizeof(int));
-	      nl=htonl(row);
-	      write(sock,&nl,sizeof(int));
-	      nl=htonl(col);
-	      write(sock,&nl,sizeof(int));
-	      count=0;
-	      r_len=BUFF_SIZE;
-	      while(count <length){
-		if((length-count) < BUFF_SIZE)
-		  r_len=length-count;
-		count +=write(sock,(tmp+(count/sizeof(char))),r_len);
-	      }
-	      //	      write(sock,cmx.data(),length);
-	    }
-	  }
-	}
-      else if(val.is_map())
-	{
-	  Octave_map map=val.map_value();
-	  octave_value_list ov_list;
-	  Cell c;
-	  int i,length=map.nfields(),key_len=0;
-	  string_vector key=map.keys();
-	  
-  	  for (i=0;i<nsock;i++){
-  	    sock=(int)sock_m.data()[i];
-	    ov_list(1)=octave_value(sock_m.row(i));
-	    type_id=7;
-	    if(sock!=0){
-	      nl=htonl(type_id);
-	      write(sock,&nl,sizeof(int));
-	      nl=htonl(length);
-	      write(sock,&nl,sizeof(int));
-	      for(i=0;i<length;i++){
-		key_len=key[i].length();
-		nl=htonl(key_len);
-		write(sock,&nl,sizeof(int));
-		c=map.contents(key[i]);
-		ov_list(0)=c(0);
-		write(sock,key[i].c_str(), key_len);
-		Fsend(ov_list,0);
-	      }
-	    }
-	  }
-	}
-      else
-	error("unsupported type %d",type_id);
-    }
-  else
-    print_usage ();
-  
   return retval;
-  
 }
-
-/*
-;;; Local Variables: ***
-;;; mode: C++ ***
-;;; End: ***
-*/