annotate netinstall/nio-ftp.cc @ 1292:f3437b56874d

[xemacs-hg @ 2003-02-13 09:57:04 by ben] profile updates profile.c: Major reworking. Keep track of new information -- total function timing (includes descendants), GC usage, total GC usage (includes descendants). New functions to be called appropriately from eval.c, alloc.c to keep track of this information. Keep track of when we're actually in a function vs. in its profile, for more accurate timing counts. Track profile overhead separately. Create new mechanism for specifying "internal sections" that are tracked just like regular Lisp functions and even appear in the backtrace if `backtrace-with-internal-sections' is non-nil (t by default for error-checking builds). Add some KKCC information for the straight (non-Elisp) hash table used by profile, which contains Lisp objects in its keys -- but not used yet. Remove old ad-hoc methods for tracking garbage collection, redisplay (which was incorrect anyway when Lisp was called within these sections). Don't record any tick info when blocking under MS Windows, since the timer there is in real time rather than in process time. Make `start-profiling', `stop-profiling' interactive. Be consistent wrt. recursive functions and functions currently on the stack when starting or stopping -- together these make implementing the `total' values extremely difficult. When we start profiling, we act as if we just entered all the functions currently on the stack. Likewise when exiting. Create vars in_profile for tracking time spent inside of profiling, and profiling_lock for setting exclusive access to the main hash table when reading from it or modifying it. (protects against getting screwed up by the signal handle going off at the same time. profile.h: New file. Create macros for declaring internal profiling sections. lisp.h: Move profile-related stuff to profile.h. alloc.c: Keep track of total consing, for profile. Tell profile when we are consing. Use new profile-section method for noting garbage-collection. alloc.c: Abort if we attempt to call the allocator reentrantly. backtrace.h, eval.c: Add info for use by profile in the backtrace frame and transfer PUSH_BACKTRACE/POP_BACKTRACE from eval.c, for use with profile. elhash.c: Author comment. eval.c, lisp.h: New Lisp var `backtrace-with-internal-sections'. Set to t when error-checking is on. eval.c: When unwinding, eval.c: Report to profile when we are about-to-call and just-called wrt. a function. alloc.c, eval.c: Allow for "fake" backtrace frames, for internal sections (used by profile and `backtrace-with-internal-sections'. event-Xt.c, event-gtk.c, event-msw.c, event-tty.c: Record when we are actually blocking on an event, for profile's sake. event-stream.c: Record internal profiling sections for getting, dispatching events. extents.c: Record internal profiling sections for map_extents. hash.c, hash.h: Add pregrow_hash_table_if_necessary(). (Used in profile code since the signal handler is the main grower but can't allow a realloc(). We make sure, at critical points, that the table is large enough.) lread.c: Create internal profiling sections for `load' (which may be triggered internally by autoload, etc.). redisplay.c: Remove old profile_redisplay_flag. Use new macros to declare internal profiling section for redisplay. text.c: Use new macros to declare internal profiling sections for char-byte conversion and internal-external conversion. SEMI-UNRELATED CHANGES: ----------------------- text.c: Update the long comments.
author ben
date Thu, 13 Feb 2003 09:57:08 +0000
parents 42a8626b741e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* This file is responsible for implementing all direct FTP protocol
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 channels. It is intentionally simplistic. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 #include "winsock.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include <stdio.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #include <ctype.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 #include "resource.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 #include "state.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 #include "simpsock.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 #include "log.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 #include "netio.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 #include "nio-ftp.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 static SimpleSocket *cmd = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 static char *cmd_host = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 static int cmd_port = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 static char *last_line;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 static int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 ftp_line (SimpleSocket *s)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42 do {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 last_line = s->gets ();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 log (LOG_BABBLE, "ftp > %s", last_line);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 } while (last_line && (!isdigit (last_line[0]) || last_line[3] != ' '));
672
42a8626b741e [xemacs-hg @ 2001-10-26 02:42:53 by andyp]
andyp
parents: 456
diff changeset
46 return atoi (last_line ?: "0");
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 NetIO_FTP::NetIO_FTP (char *Purl)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 : NetIO (Purl)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 s = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 int code;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 if (port == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56 port = 21;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 if (cmd_host && strcmp (host, cmd_host) != 0 || port != cmd_port)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 if (cmd)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 cmd->printf ("QUIT\r\n");
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 delete cmd;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 free (cmd_host);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64 cmd = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 cmd_host = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 if (cmd == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 SimpleSocket *c = new SimpleSocket (host, port);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 code = ftp_line (c);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72 c->printf ("USER anonymous\r\n");
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 code = ftp_line (c);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74 if (code == 331)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75 {
672
42a8626b741e [xemacs-hg @ 2001-10-26 02:42:53 by andyp]
andyp
parents: 456
diff changeset
76 c->printf ("PASS xemacs-setup@\r\n");
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 code = ftp_line (c);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
78 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
79
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80 if (code < 200 || code >= 300)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 delete c;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86 cmd = c;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 cmd_host = _strdup (host);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 cmd_port = port;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
90 cmd->printf ("TYPE I\r\n");
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
91 code = ftp_line (cmd);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
92 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
93
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
94 cmd->printf ("PASV\r\n");
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
95 do {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
96 code = ftp_line (cmd);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
97 } while (code == 226); /* previous RETR */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
98 if (code != 227)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
99 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
100
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
101 char *paren = strchr (last_line, '(');
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
102 if (!paren)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
103 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
104
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
105 int i1, i2, i3, i4, p1, p2;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
106 sscanf (paren+1, "%d,%d,%d,%d,%d,%d", &i1, &i2, &i3, &i4, &p1, &p2);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
107 char tmp[20];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
108 sprintf (tmp, "%d.%d.%d.%d", i1, i2, i3, i4);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
109 s = new SimpleSocket (tmp, p1*256 + p2);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
110
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
111 cmd->printf ("RETR %s\r\n", path);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
112 code = ftp_line (cmd);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
113 if (code != 150)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
114 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
115 delete s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
116 s = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
117 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
118 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
119 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
120
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
121 NetIO_FTP::~NetIO_FTP ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
122 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
123 if (s)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
124 delete s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
125 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
126
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
127 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
128 NetIO_FTP::ok ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
129 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
130 if (s)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
131 return 1;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
132 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
133 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
134
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
135 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
136 NetIO_FTP::read (char *buf, int nbytes)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
137 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
138 if (!s)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
139 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
140 return s->read (buf, nbytes);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
141 }