ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.15 by root, Sat Jul 23 18:19:56 2005 UTC vs.
Revision 1.28 by root, Wed Aug 17 05:06:59 2005 UTC

1#define _REENTRANT 1
2#include <errno.h>
3
1#include "EXTERN.h" 4#include "EXTERN.h"
2#include "perl.h" 5#include "perl.h"
3#include "XSUB.h" 6#include "XSUB.h"
7
8#include "autoconf/config.h"
4 9
5#include <sys/types.h> 10#include <sys/types.h>
6#include <sys/stat.h> 11#include <sys/stat.h>
7 12
8#include <unistd.h> 13#include <unistd.h>
9#include <fcntl.h> 14#include <fcntl.h>
10#include <signal.h> 15#include <signal.h>
11#include <sched.h> 16#include <sched.h>
12#if __linux
13#include <sys/syscall.h>
14#endif
15 17
16#include <pthread.h> 18#include <pthread.h>
17 19
18typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 20typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */
19typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */ 21typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */
… …
27 29
28enum { 30enum {
29 REQ_QUIT, 31 REQ_QUIT,
30 REQ_OPEN, REQ_CLOSE, 32 REQ_OPEN, REQ_CLOSE,
31 REQ_READ, REQ_WRITE, REQ_READAHEAD, 33 REQ_READ, REQ_WRITE, REQ_READAHEAD,
32 REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK, 34 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
33 REQ_FSYNC, REQ_FDATASYNC, 35 REQ_FSYNC, REQ_FDATASYNC,
36 REQ_UNLINK, REQ_RMDIR,
37 REQ_SYMLINK,
34}; 38};
35 39
36typedef struct aio_cb { 40typedef struct aio_cb {
37 struct aio_cb *volatile next; 41 struct aio_cb *volatile next;
38 42
… …
43 size_t length; 47 size_t length;
44 ssize_t result; 48 ssize_t result;
45 mode_t mode; /* open */ 49 mode_t mode; /* open */
46 int errorno; 50 int errorno;
47 SV *data, *callback, *fh; 51 SV *data, *callback, *fh;
48 void *dataptr; 52 void *dataptr, *data2ptr;
49 STRLEN dataoffset; 53 STRLEN dataoffset;
50 54
51 Stat_t *statdata; 55 Stat_t *statdata;
52} aio_cb; 56} aio_cb;
53 57
… …
62static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 66static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
63static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 67static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
64 68
65static volatile aio_req reqs, reqe; /* queue start, queue end */ 69static volatile aio_req reqs, reqe; /* queue start, queue end */
66static volatile aio_req ress, rese; /* queue start, queue end */ 70static volatile aio_req ress, rese; /* queue start, queue end */
71
72static void free_req (aio_req req)
73{
74 if (req->data)
75 SvREFCNT_dec (req->data);
76
77 if (req->fh)
78 SvREFCNT_dec (req->fh);
79
80 if (req->statdata)
81 Safefree (req->statdata);
82
83 if (req->callback)
84 SvREFCNT_dec (req->callback);
85
86 Safefree (req);
87}
67 88
68static void 89static void
69poll_wait () 90poll_wait ()
70{ 91{
71 if (nreqs && !ress) 92 if (nreqs && !ress)
… …
81static int 102static int
82poll_cb () 103poll_cb ()
83{ 104{
84 dSP; 105 dSP;
85 int count = 0; 106 int count = 0;
107 int do_croak = 0;
86 aio_req req, prv; 108 aio_req req;
87 109
88 pthread_mutex_lock (&reslock); 110 for (;;)
89
90 {
91 /* read any signals sent by the worker threads */
92 char buf [32];
93 while (read (respipe [0], buf, 32) > 0)
94 ;
95 }
96
97 req = ress;
98 ress = rese = 0;
99
100 pthread_mutex_unlock (&reslock);
101
102 while (req)
103 { 111 {
112 pthread_mutex_lock (&reslock);
113 req = ress;
114
115 if (req)
116 {
117 ress = req->next;
118
119 if (!ress)
120 {
121 rese = 0;
122
123 /* read any signals sent by the worker threads */
124 char buf [32];
125 while (read (respipe [0], buf, 32) == 32)
126 ;
127 }
128 }
129
130 pthread_mutex_unlock (&reslock);
131
132 if (!req)
133 break;
134
104 nreqs--; 135 nreqs--;
105 136
106 if (req->type == REQ_QUIT) 137 if (req->type == REQ_QUIT)
107 started--; 138 started--;
108 else 139 else
109 { 140 {
110 int errorno = errno; 141 int errorno = errno;
111 errno = req->errorno; 142 errno = req->errorno;
112 143
113 if (req->type == REQ_READ) 144 if (req->type == REQ_READ)
114 SvCUR_set (req->data, req->dataoffset 145 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
115 + req->result > 0 ? req->result : 0);
116 146
147 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
148 SvREADONLY_off (req->data);
149
117 if (req->data) 150 if (req->statdata)
118 SvREFCNT_dec (req->data);
119
120 if (req->fh)
121 SvREFCNT_dec (req->fh);
122
123 if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
124 { 151 {
125 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT; 152 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
126 PL_laststatval = req->result; 153 PL_laststatval = req->result;
127 PL_statcache = *(req->statdata); 154 PL_statcache = *(req->statdata);
128
129 Safefree (req->statdata);
130 } 155 }
131 156
132 ENTER; 157 ENTER;
133 PUSHMARK (SP); 158 PUSHMARK (SP);
134 XPUSHs (sv_2mortal (newSViv (req->result))); 159 XPUSHs (sv_2mortal (newSViv (req->result)));
… …
151 if (SvOK (req->callback)) 176 if (SvOK (req->callback))
152 { 177 {
153 PUTBACK; 178 PUTBACK;
154 call_sv (req->callback, G_VOID | G_EVAL); 179 call_sv (req->callback, G_VOID | G_EVAL);
155 SPAGAIN; 180 SPAGAIN;
181
182 if (SvTRUE (ERRSV))
183 {
184 free_req (req);
185 croak (0);
186 }
156 } 187 }
157 188
158 LEAVE; 189 LEAVE;
159
160 if (req->callback)
161 SvREFCNT_dec (req->callback);
162 190
163 errno = errorno; 191 errno = errorno;
164 count++; 192 count++;
165 } 193 }
166 194
167 prv = req; 195 free_req (req);
168 req = req->next;
169 Safefree (prv);
170
171 /* TODO: croak on errors? */
172 } 196 }
173 197
174 return count; 198 return count;
175} 199}
176 200
… …
214 reqe = reqs = req; 238 reqe = reqs = req;
215 239
216 pthread_cond_signal (&reqwait); 240 pthread_cond_signal (&reqwait);
217 pthread_mutex_unlock (&reqlock); 241 pthread_mutex_unlock (&reqlock);
218 242
219 while (nreqs > max_outstanding) 243 if (nreqs > max_outstanding)
244 for (;;)
245 {
246 poll_cb ();
247
248 if (nreqs <= max_outstanding)
249 break;
250
251 poll_wait ();
252 }
253}
254
255static void
256end_thread (void)
257{
258 aio_req req;
259 Newz (0, req, 1, aio_cb);
260 req->type = REQ_QUIT;
261
262 send_req (req);
263}
264
265static void min_parallel (int nthreads)
266{
267 while (nthreads > started)
268 start_thread ();
269}
270
271static void max_parallel (int nthreads)
272{
273 int cur = started;
274
275 while (cur > nthreads)
276 {
277 end_thread ();
278 cur--;
279 }
280
281 while (started > nthreads)
220 { 282 {
221 poll_wait (); 283 poll_wait ();
222 poll_cb (); 284 poll_cb ();
223 } 285 }
224} 286}
225 287
226static void 288static void create_pipe ()
227end_thread (void)
228{ 289{
290 if (pipe (respipe))
291 croak ("unable to initialize result pipe");
292
293 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
294 croak ("cannot set result pipe to nonblocking mode");
295
296 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
297 croak ("cannot set result pipe to nonblocking mode");
298}
299
300static void atfork_prepare (void)
301{
302 pthread_mutex_lock (&reqlock);
303 pthread_mutex_lock (&reslock);
304}
305
306static void atfork_parent (void)
307{
308 pthread_mutex_unlock (&reslock);
309 pthread_mutex_unlock (&reqlock);
310}
311
312static void atfork_child (void)
313{
229 aio_req req; 314 aio_req prv;
230 New (0, req, 1, aio_cb);
231 req->type = REQ_QUIT;
232 315
233 send_req (req); 316 int restart = started;
317 started = 0;
318
319 while (reqs)
320 {
321 prv = reqs;
322 reqs = prv->next;
323 free_req (prv);
324 }
325
326 reqs = reqe = 0;
327
328 while (ress)
329 {
330 prv = ress;
331 ress = prv->next;
332 free_req (prv);
333 }
334
335 ress = rese = 0;
336
337 atfork_parent ();
338
339 min_parallel (restart);
234} 340}
341
342/*****************************************************************************/
343/* work around various missing functions */
344
345#if !HAVE_PREADWRITE
346# define pread aio_pread
347# define pwrite aio_pwrite
348
349/*
350 * make our pread/pwrite safe against themselves, but not against
351 * normal read/write by using a mutex. slows down execution a lot,
352 * but that's your problem, not mine.
353 */
354static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
355
356static ssize_t
357pread (int fd, void *buf, size_t count, off_t offset)
358{
359 ssize_t res;
360 off_t ooffset;
361
362 pthread_mutex_lock (&iolock);
363 ooffset = lseek (fd, 0, SEEK_CUR);
364 lseek (fd, offset, SEEK_SET);
365 res = read (fd, buf, count);
366 lseek (fd, ooffset, SEEK_SET);
367 pthread_mutex_unlock (&iolock);
368
369 return res;
370}
371
372static ssize_t
373pwrite (int fd, void *buf, size_t count, off_t offset)
374{
375 ssize_t res;
376 off_t ooffset;
377
378 pthread_mutex_lock (&iolock);
379 ooffset = lseek (fd, 0, SEEK_CUR);
380 lseek (fd, offset, SEEK_SET);
381 res = write (fd, buf, count);
382 lseek (fd, offset, SEEK_SET);
383 pthread_mutex_unlock (&iolock);
384
385 return res;
386}
387#endif
388
389#if !HAVE_FDATASYNC
390# define fdatasync fsync
391#endif
392
393#if !HAVE_READAHEAD
394# define readahead aio_readahead
395
396static char readahead_buf[4096];
397
398static ssize_t
399readahead (int fd, off_t offset, size_t count)
400{
401 while (count > 0)
402 {
403 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
404
405 pread (fd, readahead_buf, len, offset);
406 offset += len;
407 count -= len;
408 }
409
410 errno = 0;
411}
412#endif
413
414/*****************************************************************************/
235 415
236static void * 416static void *
237aio_proc (void *thr_arg) 417aio_proc (void *thr_arg)
238{ 418{
239 aio_req req; 419 aio_req req;
… …
267 447
268 switch (type) 448 switch (type)
269 { 449 {
270 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 450 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
271 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 451 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
272#if SYS_readahead 452
273 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 453 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
274#else
275 case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
276#endif
277 454
278 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 455 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
279 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 456 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
280 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 457 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
281 458
282 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 459 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
283 case REQ_CLOSE: req->result = close (req->fd); break; 460 case REQ_CLOSE: req->result = close (req->fd); break;
284 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 461 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
462 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
463 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
285 464
465 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
286 case REQ_FSYNC: req->result = fsync (req->fd); break; 466 case REQ_FSYNC: req->result = fsync (req->fd); break;
287 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
288 467
289 case REQ_QUIT: 468 case REQ_QUIT:
290 break; 469 break;
291 470
292 default: 471 default:
… …
318 while (type != REQ_QUIT); 497 while (type != REQ_QUIT);
319 498
320 return 0; 499 return 0;
321} 500}
322 501
502#define dREQ \
503 aio_req req; \
504 \
505 if (SvOK (callback) && !SvROK (callback)) \
506 croak ("clalback must be undef or of reference type"); \
507 \
508 Newz (0, req, 1, aio_cb); \
509 if (!req) \
510 croak ("out of memory during aio_req allocation"); \
511 \
512 req->callback = newSVsv (callback);
513
323MODULE = IO::AIO PACKAGE = IO::AIO 514MODULE = IO::AIO PACKAGE = IO::AIO
324 515
325PROTOTYPES: ENABLE 516PROTOTYPES: ENABLE
326 517
327BOOT: 518BOOT:
328{ 519{
329 if (pipe (respipe)) 520 create_pipe ();
330 croak ("unable to initialize result pipe"); 521 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
331
332 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
333 croak ("cannot set result pipe to nonblocking mode");
334
335 if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
336 croak ("cannot set result pipe to nonblocking mode");
337} 522}
338 523
339void 524void
340min_parallel(nthreads) 525min_parallel(nthreads)
341 int nthreads 526 int nthreads
342 PROTOTYPE: $ 527 PROTOTYPE: $
343 CODE:
344 while (nthreads > started)
345 start_thread ();
346 528
347void 529void
348max_parallel(nthreads) 530max_parallel(nthreads)
349 int nthreads 531 int nthreads
350 PROTOTYPE: $ 532 PROTOTYPE: $
351 CODE:
352{
353 int cur = started;
354 while (cur > nthreads)
355 {
356 end_thread ();
357 cur--;
358 }
359
360 while (started > nthreads)
361 {
362 poll_wait ();
363 poll_cb ();
364 }
365}
366 533
367int 534int
368max_outstanding(nreqs) 535max_outstanding(nreqs)
369 int nreqs 536 int nreqs
370 PROTOTYPE: $ 537 PROTOTYPE: $
… …
379 int mode 546 int mode
380 SV * callback 547 SV * callback
381 PROTOTYPE: $$$;$ 548 PROTOTYPE: $$$;$
382 CODE: 549 CODE:
383{ 550{
384 aio_req req; 551 dREQ;
385
386 Newz (0, req, 1, aio_cb);
387
388 if (!req)
389 croak ("out of memory during aio_req allocation");
390 552
391 req->type = REQ_OPEN; 553 req->type = REQ_OPEN;
392 req->data = newSVsv (pathname); 554 req->data = newSVsv (pathname);
393 req->dataptr = SvPV_nolen (req->data); 555 req->dataptr = SvPVbyte_nolen (req->data);
394 req->fd = flags; 556 req->fd = flags;
395 req->mode = mode; 557 req->mode = mode;
396 req->callback = SvREFCNT_inc (callback);
397 558
398 send_req (req); 559 send_req (req);
399} 560}
400 561
401void 562void
… …
407 aio_close = REQ_CLOSE 568 aio_close = REQ_CLOSE
408 aio_fsync = REQ_FSYNC 569 aio_fsync = REQ_FSYNC
409 aio_fdatasync = REQ_FDATASYNC 570 aio_fdatasync = REQ_FDATASYNC
410 CODE: 571 CODE:
411{ 572{
412 aio_req req; 573 dREQ;
413
414 Newz (0, req, 1, aio_cb);
415
416 if (!req)
417 croak ("out of memory during aio_req allocation");
418 574
419 req->type = ix; 575 req->type = ix;
420 req->fh = newSVsv (fh); 576 req->fh = newSVsv (fh);
421 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 577 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
422 req->callback = SvREFCNT_inc (callback);
423 578
424 send_req (req); 579 send_req (req);
425} 580}
426 581
427void 582void
… …
438 PROTOTYPE: $$$$$;$ 593 PROTOTYPE: $$$$$;$
439 CODE: 594 CODE:
440{ 595{
441 aio_req req; 596 aio_req req;
442 STRLEN svlen; 597 STRLEN svlen;
443 char *svptr = SvPV (data, svlen); 598 char *svptr = SvPVbyte (data, svlen);
444 599
445 SvUPGRADE (data, SVt_PV); 600 SvUPGRADE (data, SVt_PV);
446 SvPOK_on (data); 601 SvPOK_on (data);
447 602
448 if (dataoffset < 0) 603 if (dataoffset < 0)
… …
464 } 619 }
465 620
466 if (length < 0) 621 if (length < 0)
467 croak ("length must not be negative"); 622 croak ("length must not be negative");
468 623
469 Newz (0, req, 1, aio_cb); 624 {
625 dREQ;
470 626
471 if (!req)
472 croak ("out of memory during aio_req allocation");
473
474 req->type = ix; 627 req->type = ix;
475 req->fh = newSVsv (fh); 628 req->fh = newSVsv (fh);
476 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 629 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
477 : IoOFP (sv_2io (fh))); 630 : IoOFP (sv_2io (fh)));
478 req->offset = offset; 631 req->offset = offset;
479 req->length = length; 632 req->length = length;
480 req->data = SvREFCNT_inc (data); 633 req->data = SvREFCNT_inc (data);
481 req->dataptr = (char *)svptr + dataoffset; 634 req->dataptr = (char *)svptr + dataoffset;
482 req->callback = SvREFCNT_inc (callback);
483 635
636 if (!SvREADONLY (data))
637 {
638 SvREADONLY_on (data);
639 req->data2ptr = (void *)data;
640 }
641
484 send_req (req); 642 send_req (req);
643 }
485} 644}
486 645
487void 646void
488aio_readahead(fh,offset,length,callback=&PL_sv_undef) 647aio_readahead(fh,offset,length,callback=&PL_sv_undef)
489 SV * fh 648 SV * fh
… …
491 IV length 650 IV length
492 SV * callback 651 SV * callback
493 PROTOTYPE: $$$;$ 652 PROTOTYPE: $$$;$
494 CODE: 653 CODE:
495{ 654{
496 aio_req req; 655 dREQ;
497
498 if (length < 0)
499 croak ("length must not be negative");
500
501 Newz (0, req, 1, aio_cb);
502
503 if (!req)
504 croak ("out of memory during aio_req allocation");
505 656
506 req->type = REQ_READAHEAD; 657 req->type = REQ_READAHEAD;
507 req->fh = newSVsv (fh); 658 req->fh = newSVsv (fh);
508 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 659 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
509 req->offset = offset; 660 req->offset = offset;
510 req->length = length; 661 req->length = length;
511 req->callback = SvREFCNT_inc (callback);
512 662
513 send_req (req); 663 send_req (req);
514} 664}
515 665
516void 666void
… …
520 ALIAS: 670 ALIAS:
521 aio_stat = REQ_STAT 671 aio_stat = REQ_STAT
522 aio_lstat = REQ_LSTAT 672 aio_lstat = REQ_LSTAT
523 CODE: 673 CODE:
524{ 674{
525 aio_req req; 675 dREQ;
526
527 Newz (0, req, 1, aio_cb);
528
529 if (!req)
530 croak ("out of memory during aio_req allocation");
531 676
532 New (0, req->statdata, 1, Stat_t); 677 New (0, req->statdata, 1, Stat_t);
533
534 if (!req->statdata) 678 if (!req->statdata)
679 {
680 free_req (req);
535 croak ("out of memory during aio_req->statdata allocation"); 681 croak ("out of memory during aio_req->statdata allocation");
682 }
536 683
537 if (SvPOK (fh_or_path)) 684 if (SvPOK (fh_or_path))
538 { 685 {
539 req->type = ix; 686 req->type = ix;
540 req->data = newSVsv (fh_or_path); 687 req->data = newSVsv (fh_or_path);
541 req->dataptr = SvPV_nolen (req->data); 688 req->dataptr = SvPVbyte_nolen (req->data);
542 } 689 }
543 else 690 else
544 { 691 {
545 req->type = REQ_FSTAT; 692 req->type = REQ_FSTAT;
546 req->fh = newSVsv (fh_or_path); 693 req->fh = newSVsv (fh_or_path);
547 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 694 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
548 } 695 }
549 696
550 req->callback = SvREFCNT_inc (callback);
551
552 send_req (req); 697 send_req (req);
553} 698}
554 699
555void 700void
556aio_unlink(pathname,callback=&PL_sv_undef) 701aio_unlink(pathname,callback=&PL_sv_undef)
557 SV * pathname 702 SV * pathname
558 SV * callback 703 SV * callback
704 ALIAS:
705 aio_unlink = REQ_UNLINK
706 aio_rmdir = REQ_RMDIR
559 CODE: 707 CODE:
560{ 708{
561 aio_req req; 709 dREQ;
562 710
563 Newz (0, req, 1, aio_cb); 711 req->type = ix;
712 req->data = newSVsv (pathname);
713 req->dataptr = SvPVbyte_nolen (req->data);
564 714
565 if (!req) 715 send_req (req);
566 croak ("out of memory during aio_req allocation"); 716}
717
718void
719aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
720 SV * oldpath
721 SV * newpath
722 SV * callback
723 CODE:
724{
725 dREQ;
567 726
568 req->type = REQ_UNLINK; 727 req->type = REQ_SYMLINK;
728 req->fh = newSVsv (oldpath);
729 req->data2ptr = SvPVbyte_nolen (req->fh);
569 req->data = newSVsv (pathname); 730 req->data = newSVsv (newpath);
570 req->dataptr = SvPV_nolen (req->data); 731 req->dataptr = SvPVbyte_nolen (req->data);
571 req->callback = SvREFCNT_inc (callback);
572 732
573 send_req (req); 733 send_req (req);
574} 734}
575 735
576void 736void

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines