octave-nkf: libinterp/dldfcn/urlwrite.cc comparison

comparison libinterp/dldfcn/urlwrite.cc @ 17548:92541ff4cc3c

improve implementation of ftp object handles * urlwrite.cc (curl_handles): Delete class. (handles): Delete static variable. (ch_manager): New class. (make_handle_fraction): New function. (F__ftp_pwd__, F__ftp_cwd__, F__ftp_dir__, F__ftp_ascii__, F__ftp_binary__, F__ftp_mode__, F__ftp_delete__, F__ftp_rmdir__, F__ftp_mkdir__, F__ftp_rename__, F__ftp_mput__, F__ftp_mget__): Find curl object corresponding to given handle using ch_manager instead of looking in handles map. (F__ftp__): Return handle instead of accepting it as argument. Change all uses.

author	John W. Eaton <jwe@octave.org>
date	Wed, 02 Oct 2013 23:40:01 -0400
parents	53ae37d37b16
children	a646665cd574

comparison

equal deleted inserted replaced

-:e7a9be8fdd21
+:92541ff4cc3c
 #include "dir-ops.h"
 #include "file-ops.h"
 #include "file-stat.h"
 #include "oct-env.h"
+#include "oct-handle.h"
 #include "glob-match.h"
+#include "singleton-cleanup.h"
 #include "defun-dld.h"
 #include "error.h"
 #include "oct-obj.h"
 #include "ov-cell.h"
 }
 #undef setopt
 };
-class
+typedef octave_handle curl_handle;
-curl_handles
-{
+class OCTINTERP_API ch_manager
+{
+protected:
+ch_manager (void)
+: handle_map (), handle_free_list (),
+next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0)) { }
 public:
-typedef std::map<std::string, curl_object>::iterator iterator;
+static void create_instance (void);
-typedef std::map<std::string, curl_object>::const_iterator const_iterator;
+static bool instance_ok (void)
-curl_handles (void) : map ()
+{
-{
+bool retval = true;
-curl_global_init (CURL_GLOBAL_DEFAULT);
-}
+if (! instance)
+create_instance ();
-~curl_handles (void)
-{
+if (! instance)
-// Remove the elements of the map explicitly as they should
+{
-// be deleted before the call to curl_global_cleanup
+::error ("unable to create ch_manager!");
-map.erase (begin (), end ());
+retval = false;
-curl_global_cleanup ();
+}
-}
+return retval;
-iterator begin (void) { return iterator (map.begin ()); }
+}
-const_iterator begin (void) const { return const_iterator (map.begin ()); }
+static void cleanup_instance (void) { delete instance; instance = 0; }
-iterator end (void) { return iterator (map.end ()); }
-const_iterator end (void) const { return const_iterator (map.end ()); }
+static curl_handle get_handle (void)
+{
-iterator seek (const std::string& k) { return map.find (k); }
+return instance_ok ()
-const_iterator seek (const std::string& k) const { return map.find (k); }
+? instance->do_get_handle () : curl_handle ();
+}
-std::string key (const_iterator p) const { return p->first; }
+static void free (const curl_handle& h)
-curl_object& contents (const std::string& k)
+{
-{
+if (instance_ok ())
-return map[k];
+instance->do_free (h);
 }
-curl_object contents (const std::string& k) const
+static curl_handle lookup (double val)
 {
-const_iterator p = seek (k);
+return instance_ok () ? instance->do_lookup (val) : curl_handle ();
-return p != end () ? p->second : curl_object ();
+}
-}
+static curl_handle lookup (const octave_value& val)
-curl_object& contents (iterator p)
+{
-{ return p->second; }
+return val.is_real_scalar ()
+? lookup (val.double_value ()) : curl_handle ();
-curl_object contents (const_iterator p) const
+}
-{ return p->second; }
+static curl_object get_object (double val)
-void del (const std::string& k)
+{
-{
+return get_object (lookup (val));
-iterator p = map.find (k);
+}
-if (p != map.end ())
+static curl_object get_object (const octave_value& val)
-map.erase (p);
+{
-}
+return get_object (lookup (val));
+}
+static curl_object get_object (const curl_handle& h)
+{
+return instance_ok () ? instance->do_get_object (h) : curl_object ();
+}
+static curl_handle make_curl_handle (const std::string& host,
+const std::string& user,
+const std::string& passwd)
+{
+return instance_ok ()
+? instance->do_make_curl_handle (host, user, passwd) : curl_handle ();
+}
+static Matrix handle_list (void)
+{
+return instance_ok () ? instance->do_handle_list () : Matrix ();
+}
 private:
-std::map<std::string, curl_object> map;
+static ch_manager *instance;
+typedef std::map<curl_handle, curl_object>::iterator iterator;
+typedef std::map<curl_handle, curl_object>::const_iterator const_iterator;
+typedef std::set<curl_handle>::iterator free_list_iterator;
+typedef std::set<curl_handle>::const_iterator const_free_list_iterator;
+// A map of handles to curl objects.
+std::map<curl_handle, curl_object> handle_map;
+// The available curl handles.
+std::set<curl_handle> handle_free_list;
+// The next handle available if handle_free_list is empty.
+double next_handle;
+curl_handle do_get_handle (void);
+void do_free (const curl_handle& h);
+curl_handle do_lookup (double val)
+{
+iterator p = (xisnan (val) ? handle_map.end () : handle_map.find (val));
+return (p != handle_map.end ()) ? p->first : curl_handle ();
+}
+curl_object do_get_object (const curl_handle& h)
+{
+iterator p = (h.ok () ? handle_map.find (h) : handle_map.end ());
+return (p != handle_map.end ()) ? p->second : curl_object ();
+}
+curl_handle do_make_curl_handle (const std::string& host,
+const std::string& user,
+const std::string& passwd)
+{
+curl_handle h = get_handle ();
+curl_object obj (host, user, passwd);
+if (! error_state)
+handle_map[h] = obj;
+else
+{
+do_free (h);
+h = curl_handle ();
+}
+return h;
+}
+Matrix do_handle_list (void)
+{
+Matrix retval (1, handle_map.size ());
+octave_idx_type i = 0;
+for (const_iterator p = handle_map.begin (); p != handle_map.end (); p++)
+{
+curl_handle h = p->first;
+retval(i++) = h.value ();
+}
+return retval;
+}
 };
-static curl_handles handles;
+void
+ch_manager::create_instance (void)
+{
+instance = new ch_manager ();
+if (instance)
+singleton_cleanup_list::add (cleanup_instance);
+}
+static double
+make_handle_fraction (void)
+{
+static double maxrand = RAND_MAX + 2.0;
+return (rand () + 1.0) / maxrand;
+}
+curl_handle
+ch_manager::do_get_handle (void)
+{
+curl_handle retval;
+// Curl handles are negative integers plus some random fractional
+// part.  To avoid running out of integers, we recycle the integer
+// part but tack on a new random part each time.
+free_list_iterator p = handle_free_list.begin ();
+if (p != handle_free_list.end ())
+{
+retval = *p;
+handle_free_list.erase (p);
+}
+else
+{
+retval = curl_handle (next_handle);
+next_handle = std::ceil (next_handle) - 1.0 - make_handle_fraction ();
+}
+return retval;
+}
+void
+ch_manager::do_free (const curl_handle& h)
+{
+if (h.ok ())
+{
+iterator p = handle_map.find (h);
+if (p != handle_map.end ())
+{
+// Curl handles are negative integers plus some random
+// fractional part.  To avoid running out of integers, we
+// recycle the integer part but tack on a new random part
+// each time.
+handle_map.erase (p);
+if (h.value () < 0)
+handle_free_list.insert (std::ceil (h.value ()) - make_handle_fraction ());
+}
+else
+error ("ch_manager::free: invalid object %g", h.value ());
+}
+}
+ch_manager *ch_manager::instance = 0;
 static void
 cleanup_urlwrite (std::string filename)
 {
 octave_unlink (filename);
 return retval;
 }
 DEFUN_DLD (__ftp__, args, ,
 "-*- texinfo -*-\n\
-@deftypefn  {Loadable Function} {} __ftp__ (@var{handle}, @var{host})\n\
+@deftypefn  {Loadable Function} {@var{handle} =} __ftp__ (@var{host})\n\
-@deftypefnx {Loadable Function} {} __ftp__ (@var{handle}, @var{host}, @var{username}, @var{password})\n\
+@deftypefnx {Loadable Function} {@var{handle} =} __ftp__ (@var{host}, @var{username}, @var{password})\n\
 Undocumented internal function\n\
 @end deftypefn")
 {
+octave_value retval;
 #ifdef HAVE_CURL
 int nargin = args.length ();
-std::string handle;
 std::string host;
 std::string user = "anonymous";
 std::string passwd = "";
-if (nargin < 2 || nargin > 4)
+if (nargin < 1 || nargin > 3)
-error ("incorrect number of arguments");
+{
+print_usage ();
+return retval;
+}
 else
 {
-handle = args(0).string_value ();
+host = args(0).string_value ();
-host = args(1).string_value ();
 if (nargin > 1)
-user = args(2).string_value ();
+user = args(1).string_value ();
 if (nargin > 2)
-passwd = args(3).string_value ();
+passwd = args(2).string_value ();
-if (!error_state)
+if (! error_state)
 {
-handles.contents (handle) = curl_object (host, user, passwd);
+curl_handle ch = ch_manager::make_curl_handle (host, user, passwd);
-if (error_state)
+if (! error_state)
-handles.del (handle);
+retval = ch.value ();
 }
 }
 #else
 gripe_disabled_feature ("__ftp__", "FTP");
 #endif
-return octave_value ();
+return retval;
 }
 DEFUN_DLD (__ftp_pwd__, args, ,
 "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {} __ftp_pwd__ (@var{handle})\n\
 if (nargin != 1)
 error ("__ftp_pwd__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-if (!error_state)
+if (curl.is_valid ())
-{
+retval = curl.pwd ();
-const curl_object curl = handles.contents (handle);
+else
+error ("__ftp_pwd__: invalid ftp handle");
-if (curl.is_valid ())
-retval = curl.pwd ();
-else
-error ("__ftp_pwd__: invalid ftp handle");
-}
 }
 #else
 gripe_disabled_feature ("__ftp_pwd__", "FTP");
 #endif
 if (nargin != 1 && nargin != 2)
 error ("__ftp_cwd__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-std::string path = "";
+if (curl.is_valid ())
-if (nargin > 1)
+{
-path  = args(1).string_value ();
+std::string path = "";
-if (!error_state)
+if (nargin > 1)
-{
+path = args(1).string_value ();
-const curl_object curl = handles.contents (handle);
+if (! error_state)
-if (curl.is_valid ())
 curl.cwd (path);
 else
-error ("__ftp_cwd__: invalid ftp handle");
+error ("__ftp_cwd__: expecting path as second argument");
 }
+else
+error ("__ftp_cwd__: invalid ftp handle");
 }
 #else
 gripe_disabled_feature ("__ftp_cwd__", "FTP");
 #endif
 if (nargin != 1)
 error ("__ftp_dir__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-if (!error_state)
+if (curl.is_valid ())
 {
-const curl_object curl = handles.contents (handle);
+if (nargout == 0)
+curl.dir ();
-if (curl.is_valid ())
+else
 {
-if (nargout == 0)
+string_vector sv = curl.list ();
-curl.dir ();
+octave_idx_type n = sv.length ();
+if (n == 0)
+{
+string_vector flds (5);
+flds(0) = "name";
+flds(1) = "date";
+flds(2) = "bytes";
+flds(3) = "isdir";
+flds(4) = "datenum";
+retval = octave_map (flds);
+}
 else
 {
-string_vector sv = curl.list ();
+octave_map st;
-octave_idx_type n = sv.length ();
-if (n == 0)
+Cell filectime (dim_vector (n, 1));
+Cell filesize (dim_vector (n, 1));
+Cell fileisdir (dim_vector (n, 1));
+Cell filedatenum (dim_vector (n, 1));
+st.assign ("name", Cell (sv));
+for (octave_idx_type i = 0; i < n; i++)
 {
-string_vector flds (5);
+time_t ftime;
-flds(0) = "name";
+bool fisdir;
-flds(1) = "date";
+double fsize;
-flds(2) = "bytes";
-flds(3) = "isdir";
+curl.get_fileinfo (sv(i), fsize, ftime, fisdir);
-flds(4) = "datenum";
-retval = octave_map (flds);
+fileisdir (i) = fisdir;
+filectime (i) = ctime (&ftime);
+filesize (i) = fsize;
+filedatenum (i) = double (ftime);
 }
-else
-{
+st.assign ("date", filectime);
-octave_map st;
+st.assign ("bytes", filesize);
-Cell filectime (dim_vector (n, 1));
+st.assign ("isdir", fileisdir);
-Cell filesize (dim_vector (n, 1));
+st.assign ("datenum", filedatenum);
-Cell fileisdir (dim_vector (n, 1));
-Cell filedatenum (dim_vector (n, 1));
+retval = st;
-st.assign ("name", Cell (sv));
-for (octave_idx_type i = 0; i < n; i++)
-{
-time_t ftime;
-bool fisdir;
-double fsize;
-curl.get_fileinfo (sv(i), fsize, ftime, fisdir);
-fileisdir (i) = fisdir;
-filectime (i) = ctime (&ftime);
-filesize (i) = fsize;
-filedatenum (i) = double (ftime);
-}
-st.assign ("date", filectime);
-st.assign ("bytes", filesize);
-st.assign ("isdir", fileisdir);
-st.assign ("datenum", filedatenum);
-retval = st;
-}
 }
 }
-else
+}
-error ("__ftp_dir__: invalid ftp handle");
+else
-}
+error ("__ftp_dir__: invalid ftp handle");
 }
 #else
 gripe_disabled_feature ("__ftp_dir__", "FTP");
 #endif
 if (nargin != 1)
 error ("__ftp_ascii__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-if (!error_state)
+if (curl.is_valid ())
-{
+curl.ascii ();
-const curl_object curl = handles.contents (handle);
+else
+error ("__ftp_ascii__: invalid ftp handle");
-if (curl.is_valid ())
-curl.ascii ();
-else
-error ("__ftp_ascii__: invalid ftp handle");
-}
 }
 #else
 gripe_disabled_feature ("__ftp_ascii__", "FTP");
 #endif
 if (nargin != 1)
 error ("__ftp_binary__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-if (!error_state)
+if (curl.is_valid ())
-{
+curl.binary ();
-const curl_object curl = handles.contents (handle);
+else
+error ("__ftp_binary__: invalid ftp handle");
-if (curl.is_valid ())
-curl.binary ();
-else
-error ("__ftp_binary__: invalid ftp handle");
-}
 }
 #else
 gripe_disabled_feature ("__ftp_binary__", "FTP");
 #endif
 if (nargin != 1)
 error ("__ftp_close__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+curl_handle h = ch_manager::lookup (args(0));
-if (! error_state)
+if (h.ok ())
-handles.del (handle);
+ch_manager::free (h);
+else
+error ("__ftp_close__: invalid ftp handle");
 }
 #else
 gripe_disabled_feature ("__ftp_close__", "FTP");
 #endif
 if (nargin != 1)
 error ("__ftp_mode__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
+if (curl.is_valid ())
-if (! error_state)
+retval = (curl.is_ascii () ? "ascii" : "binary");
-{
+else
-const curl_object curl = handles.contents (handle);
+error ("__ftp_binary__: invalid ftp handle");
-if (curl.is_valid ())
-retval = (curl.is_ascii () ? "ascii" : "binary");
-else
-error ("__ftp_binary__: invalid ftp handle");
-}
 }
 #else
 gripe_disabled_feature ("__ftp_mode__", "FTP");
 #endif
 if (nargin != 2)
 error ("__ftp_delete__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-std::string file = args(1).string_value ();
+if (curl.is_valid ())
-if (!error_state)
+{
-{
+std::string file = args(1).string_value ();
-const curl_object curl = handles.contents (handle);
+if (! error_state)
-if (curl.is_valid ())
 curl.del (file);
 else
-error ("__ftp_delete__: invalid ftp handle");
+error ("__ftp_delete__: expecting file name as second argument");
 }
+else
+error ("__ftp_delete__: invalid ftp handle");
 }
 #else
 gripe_disabled_feature ("__ftp_delete__", "FTP");
 #endif
 if (nargin != 2)
 error ("__ftp_rmdir__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-std::string dir = args(1).string_value ();
+if (curl.is_valid ())
-if (!error_state)
+{
-{
+std::string dir = args(1).string_value ();
-const curl_object curl = handles.contents (handle);
+if (! error_state)
-if (curl.is_valid ())
 curl.rmdir (dir);
 else
-error ("__ftp_rmdir__: invalid ftp handle");
+error ("__ftp_rmdir__: expecting directory name as second argument");
 }
+else
+error ("__ftp_rmdir__: invalid ftp handle");
 }
 #else
 gripe_disabled_feature ("__ftp_rmdir__", "FTP");
 #endif
 if (nargin != 2)
 error ("__ftp_mkdir__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-std::string dir = args(1).string_value ();
+if (curl.is_valid ())
-if (!error_state)
+{
-{
+std::string dir = args(1).string_value ();
-const curl_object curl = handles.contents (handle);
+if (! error_state)
-if (curl.is_valid ())
 curl.mkdir (dir);
 else
-error ("__ftp_mkdir__: invalid ftp handle");
+error ("__ftp_mkdir__: expecting directory name as second argument");
 }
+else
+error ("__ftp_mkdir__: invalid ftp handle");
 }
 #else
 gripe_disabled_feature ("__ftp_mkdir__", "FTP");
 #endif
 if (nargin != 3)
 error ("__ftp_rename__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-std::string oldname = args(1).string_value ();
-std::string newname = args(2).string_value ();
+if (curl.is_valid ())
+{
-if (!error_state)
+std::string oldname = args(1).string_value ();
-{
+std::string newname = args(2).string_value ();
-const curl_object curl = handles.contents (handle);
+if (! error_state)
-if (curl.is_valid ())
 curl.rename (oldname, newname);
 else
-error ("__ftp_rename__: invalid ftp handle");
+error ("__ftp_rename__: expecting file names for second and third arguments");
 }
+else
+error ("__ftp_rename__: invalid ftp handle");
 }
 #else
 gripe_disabled_feature ("__ftp_rename__", "FTP");
 #endif
 if (nargin != 2)
 error ("__ftp_mput__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-std::string pat = args(1).string_value ();
+if (curl.is_valid ())
-if (!error_state)
+{
-{
+std::string pat = args(1).string_value ();
-const curl_object curl = handles.contents (handle);
+if (! error_state)
-if (curl.is_valid ())
 {
 glob_match pattern (file_ops::tilde_expand (pat));
 string_vector files = pattern.glob ();
 for (octave_idx_type i = 0; i < files.length (); i++)
 retval.append (file);
 }
 }
 }
 else
-error ("__ftp_mput__: invalid ftp handle");
+error ("__ftp_mput__: expecting file name patter as second argument");
 }
+else
+error ("__ftp_mput__: invalid ftp handle");
 }
 #else
 gripe_disabled_feature ("__ftp_mput__", "FTP");
 #endif
 if (nargin != 2 && nargin != 3)
 error ("__ftp_mget__: incorrect number of arguments");
 else
 {
-std::string handle = args(0).string_value ();
+const curl_object curl = ch_manager::get_object (args(0));
-std::string file = args(1).string_value ();
-std::string target;
+if (curl.is_valid ())
+{
-if (nargin == 3)
+std::string file = args(1).string_value ();
-target = args(2).string_value () + file_ops::dir_sep_str ();
+std::string target;
-if (! error_state)
+if (nargin == 3)
-{
+target = args(2).string_value () + file_ops::dir_sep_str ();
-const curl_object curl = handles.contents (handle);
+if (! error_state)
-if (curl.is_valid ())
 {
 string_vector sv = curl.list ();
 octave_idx_type n = 0;
 glob_match pattern (file);
 }
 }
 if (n == 0)
 error ("__ftp_mget__: file not found");
 }
-}
+else
+error ("__ftp_mget__: expecting file name and target as second and third arguments");
+}
+else
+error ("__ftp_mget__: invalid ftp handle");
 }
 #else
 gripe_disabled_feature ("__ftp_mget__", "FTP");
 #endif

Mercurial > octave-nkf

comparison libinterp/dldfcn/urlwrite.cc @ 17548:92541ff4cc3c