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

Comparing EV/EV.xs (file contents):
Revision 1.26 by root, Wed Oct 31 21:34:45 2007 UTC vs.
Revision 1.33 by root, Thu Nov 1 11:55:54 2007 UTC

… …
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5/*#include <netinet/in.h>*/ 5/*#include <netinet/in.h>*/
6 6
7#define TIMEOUT_NONE HUGE_VAL 7#define TIMEOUT_NONE HUGE_VAL
8#define HAVE_EPOLL 1 8#define EV_USE_EPOLL 1
9 9
10#define EV_PROTOTYPES 1 10#define EV_PROTOTYPES 1
11#include "EV/EVAPI.h" 11#include "EV/EVAPI.h"
12 12
13#include "libev/ev.c" 13#include "libev/ev.c"
… …
17static struct EVAPI evapi; 17static struct EVAPI evapi;
18 18
19static HV 19static HV
20 *stash_watcher, 20 *stash_watcher,
21 *stash_io, 21 *stash_io,
22 *stash_time,
23 *stash_timer, 22 *stash_timer,
24 *stash_periodic, 23 *stash_periodic,
25 *stash_signal, 24 *stash_signal,
26 *stash_idle, 25 *stash_idle,
27 *stash_prepare, 26 *stash_prepare,
… …
31static int 30static int
32sv_signum (SV *sig) 31sv_signum (SV *sig)
33{ 32{
34 int signum; 33 int signum;
35 34
36 if (SvIV (sig) > 0) 35 SvGETMAGIC (sig);
37 return SvIV (sig);
38 36
39 for (signum = 1; signum < SIG_SIZE; ++signum) 37 for (signum = 1; signum < SIG_SIZE; ++signum)
40 if (strEQ (SvPV_nolen (sig), PL_sig_name [signum])) 38 if (strEQ (SvPV_nolen (sig), PL_sig_name [signum]))
41 return signum; 39 return signum;
42 40
41 if (SvIV (sig) > 0)
42 return SvIV (sig);
43
43 return -1; 44 return -1;
44} 45}
45 46
46///////////////////////////////////////////////////////////////////////////// 47/////////////////////////////////////////////////////////////////////////////
47// Event 48// Event
… …
57 fh = SvRV (fh); 58 fh = SvRV (fh);
58 59
59 if (SvTYPE (fh) == SVt_PVGV) 60 if (SvTYPE (fh) == SVt_PVGV)
60 return PerlIO_fileno (IoIFP (sv_2io (fh))); 61 return PerlIO_fileno (IoIFP (sv_2io (fh)));
61 62
62 if (SvIOK (fh)) 63 if ((SvIV (fh) >= 0) && (SvIV (fh) < 0x7ffffff))
63 return SvIV (fh); 64 return SvIV (fh);
64 65
65 return -1; 66 return -1;
66} 67}
67 68
… …
73 SvPOK_only (self); 74 SvPOK_only (self);
74 SvCUR_set (self, size); 75 SvCUR_set (self, size);
75 76
76 w = (struct ev_watcher *)SvPVX (self); 77 w = (struct ev_watcher *)SvPVX (self);
77 78
78 evw_init (w, e_cb); 79 ev_watcher_init (w, e_cb);
79 80
80 w->fh = 0; 81 w->fh = 0;
81 w->cb_sv = newSVsv (cb_sv); 82 w->cb_sv = newSVsv (cb_sv);
82 w->self = self; 83 w->self = self;
83 84
… …
203#endif 204#endif
204 205
205#define CHECK_REPEAT(repeat) if (repeat < 0.) \ 206#define CHECK_REPEAT(repeat) if (repeat < 0.) \
206 croak (# repeat " value must be >= 0"); 207 croak (# repeat " value must be >= 0");
207 208
209#define CHECK_FD(fh,fd) if ((fd) < 0) \
210 croak ("illegal file descriptor or filehandle (either no attached file descriptor or illegal value): %s", SvPV_nolen (fh));
211
208///////////////////////////////////////////////////////////////////////////// 212/////////////////////////////////////////////////////////////////////////////
209// XS interface functions 213// XS interface functions
210 214
211MODULE = EV PACKAGE = EV PREFIX = ev_ 215MODULE = EV PACKAGE = EV PREFIX = ev_
212 216
… …
242 246
243 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 247 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
244 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 248 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
245 249
246 stash_watcher = gv_stashpv ("EV::Watcher" , 1); 250 stash_watcher = gv_stashpv ("EV::Watcher" , 1);
247 stash_io = gv_stashpv ("EV::IO" , 1); 251 stash_io = gv_stashpv ("EV::Io" , 1);
248 stash_time = gv_stashpv ("EV::Time" , 1);
249 stash_timer = gv_stashpv ("EV::Timer" , 1); 252 stash_timer = gv_stashpv ("EV::Timer" , 1);
250 stash_periodic = gv_stashpv ("EV::Periodic", 1); 253 stash_periodic = gv_stashpv ("EV::Periodic", 1);
251 stash_signal = gv_stashpv ("EV::Signal" , 1); 254 stash_signal = gv_stashpv ("EV::Signal" , 1);
252 stash_idle = gv_stashpv ("EV::Idle" , 1); 255 stash_idle = gv_stashpv ("EV::Idle" , 1);
253 stash_prepare = gv_stashpv ("EV::Prepare" , 1); 256 stash_prepare = gv_stashpv ("EV::Prepare" , 1);
… …
267 evapi.method = &ev_method; 270 evapi.method = &ev_method;
268 evapi.loop_done = &ev_loop_done; 271 evapi.loop_done = &ev_loop_done;
269 evapi.time = ev_time; 272 evapi.time = ev_time;
270 evapi.loop = ev_loop; 273 evapi.loop = ev_loop;
271 evapi.once = ev_once; 274 evapi.once = ev_once;
272 evapi.io_start = evio_start; 275 evapi.io_start = ev_io_start;
273 evapi.io_stop = evio_stop; 276 evapi.io_stop = ev_io_stop;
274 evapi.timer_start = evtimer_start; 277 evapi.timer_start = ev_timer_start;
275 evapi.timer_stop = evtimer_stop; 278 evapi.timer_stop = ev_timer_stop;
276 evapi.timer_again = evtimer_again; 279 evapi.timer_again = ev_timer_again;
277 evapi.periodic_start = evperiodic_start; 280 evapi.periodic_start = ev_periodic_start;
278 evapi.periodic_stop = evperiodic_stop; 281 evapi.periodic_stop = ev_periodic_stop;
279 evapi.signal_start = evsignal_start; 282 evapi.signal_start = ev_signal_start;
280 evapi.signal_stop = evsignal_stop; 283 evapi.signal_stop = ev_signal_stop;
281 evapi.idle_start = evidle_start; 284 evapi.idle_start = ev_idle_start;
282 evapi.idle_stop = evidle_stop; 285 evapi.idle_stop = ev_idle_stop;
283 evapi.prepare_start = evprepare_start; 286 evapi.prepare_start = ev_prepare_start;
284 evapi.prepare_stop = evprepare_stop; 287 evapi.prepare_stop = ev_prepare_stop;
285 evapi.check_start = evcheck_start; 288 evapi.check_start = ev_check_start;
286 evapi.check_stop = evcheck_stop; 289 evapi.check_stop = ev_check_stop;
287 evapi.child_start = evchild_start; 290 evapi.child_start = ev_child_start;
288 evapi.child_stop = evchild_stop; 291 evapi.child_stop = ev_child_stop;
289 292
290 sv_setiv (sv, (IV)&evapi); 293 sv_setiv (sv, (IV)&evapi);
291 SvREADONLY_on (sv); 294 SvREADONLY_on (sv);
292 } 295 }
296
297 pthread_atfork (ev_fork_prepare, ev_fork_parent, ev_fork_child);
293} 298}
294 299
295NV ev_now () 300NV ev_now ()
296 CODE: 301 CODE:
297 RETVAL = ev_now; 302 RETVAL = ev_now;
… …
316 321
317struct ev_io *io (SV *fh, int events, SV *cb) 322struct ev_io *io (SV *fh, int events, SV *cb)
318 ALIAS: 323 ALIAS:
319 io_ns = 1 324 io_ns = 1
320 CODE: 325 CODE:
326{
327 int fd = sv_fileno (fh);
328 CHECK_FD (fh, fd);
329
321 RETVAL = e_new (sizeof (struct ev_io), cb); 330 RETVAL = e_new (sizeof (struct ev_io), cb);
322 RETVAL->fh = newSVsv (fh); 331 RETVAL->fh = newSVsv (fh);
323 evio_set (RETVAL, sv_fileno (RETVAL->fh), events); 332 ev_io_set (RETVAL, fd, events);
324 if (!ix) evio_start (RETVAL); 333 if (!ix) ev_io_start (RETVAL);
334}
325 OUTPUT: 335 OUTPUT:
326 RETVAL 336 RETVAL
327 337
328struct ev_timer *timer (NV after, NV repeat, SV *cb) 338struct ev_timer *timer (NV after, NV repeat, SV *cb)
329 ALIAS: 339 ALIAS:
330 timer_ns = 1 340 timer_ns = 1
331 INIT: 341 INIT:
332 CHECK_REPEAT (repeat); 342 CHECK_REPEAT (repeat);
333 CODE: 343 CODE:
334 RETVAL = e_new (sizeof (struct ev_timer), cb); 344 RETVAL = e_new (sizeof (struct ev_timer), cb);
335 evtimer_set (RETVAL, after, repeat); 345 ev_timer_set (RETVAL, after, repeat);
336 if (!ix) evtimer_start (RETVAL); 346 if (!ix) ev_timer_start (RETVAL);
337 OUTPUT: 347 OUTPUT:
338 RETVAL 348 RETVAL
339 349
340struct ev_periodic *periodic (NV at, NV interval, SV *cb) 350struct ev_periodic *periodic (NV at, NV interval, SV *cb)
341 ALIAS: 351 ALIAS:
342 periodic_ns = 1 352 periodic_ns = 1
343 INIT: 353 INIT:
344 CHECK_REPEAT (interval); 354 CHECK_REPEAT (interval);
345 CODE: 355 CODE:
346 RETVAL = e_new (sizeof (struct ev_periodic), cb); 356 RETVAL = e_new (sizeof (struct ev_periodic), cb);
347 evperiodic_set (RETVAL, at, interval); 357 ev_periodic_set (RETVAL, at, interval);
348 if (!ix) evperiodic_start (RETVAL); 358 if (!ix) ev_periodic_start (RETVAL);
349 OUTPUT: 359 OUTPUT:
350 RETVAL 360 RETVAL
351 361
352struct ev_signal *signal (Signal signum, SV *cb) 362struct ev_signal *signal (Signal signum, SV *cb)
353 ALIAS: 363 ALIAS:
354 signal_ns = 1 364 signal_ns = 1
355 CODE: 365 CODE:
356 RETVAL = e_new (sizeof (struct ev_signal), cb); 366 RETVAL = e_new (sizeof (struct ev_signal), cb);
357 evsignal_set (RETVAL, signum); 367 ev_signal_set (RETVAL, signum);
358 if (!ix) evsignal_start (RETVAL); 368 if (!ix) ev_signal_start (RETVAL);
359 OUTPUT: 369 OUTPUT:
360 RETVAL 370 RETVAL
361 371
362struct ev_idle *idle (SV *cb) 372struct ev_idle *idle (SV *cb)
363 ALIAS: 373 ALIAS:
364 idle_ns = 1 374 idle_ns = 1
365 CODE: 375 CODE:
366 RETVAL = e_new (sizeof (struct ev_idle), cb); 376 RETVAL = e_new (sizeof (struct ev_idle), cb);
367 evidle_set (RETVAL); 377 ev_idle_set (RETVAL);
368 if (!ix) evidle_start (RETVAL); 378 if (!ix) ev_idle_start (RETVAL);
369 OUTPUT: 379 OUTPUT:
370 RETVAL 380 RETVAL
371 381
372struct ev_prepare *prepare (SV *cb) 382struct ev_prepare *prepare (SV *cb)
373 ALIAS: 383 ALIAS:
374 prepare_ns = 1 384 prepare_ns = 1
375 CODE: 385 CODE:
376 RETVAL = e_new (sizeof (struct ev_prepare), cb); 386 RETVAL = e_new (sizeof (struct ev_prepare), cb);
377 evprepare_set (RETVAL); 387 ev_prepare_set (RETVAL);
378 if (!ix) evprepare_start (RETVAL); 388 if (!ix) ev_prepare_start (RETVAL);
379 OUTPUT: 389 OUTPUT:
380 RETVAL 390 RETVAL
381 391
382struct ev_check *check (SV *cb) 392struct ev_check *check (SV *cb)
383 ALIAS: 393 ALIAS:
384 check_ns = 1 394 check_ns = 1
385 CODE: 395 CODE:
386 RETVAL = e_new (sizeof (struct ev_check), cb); 396 RETVAL = e_new (sizeof (struct ev_check), cb);
387 evcheck_set (RETVAL); 397 ev_check_set (RETVAL);
388 if (!ix) evcheck_start (RETVAL); 398 if (!ix) ev_check_start (RETVAL);
389 OUTPUT: 399 OUTPUT:
390 RETVAL 400 RETVAL
391 401
392struct ev_child *child (int pid, SV *cb) 402struct ev_child *child (int pid, SV *cb)
393 ALIAS: 403 ALIAS:
394 check_ns = 1 404 check_ns = 1
395 CODE: 405 CODE:
396 RETVAL = e_new (sizeof (struct ev_check), cb); 406 RETVAL = e_new (sizeof (struct ev_check), cb);
397 evchild_set (RETVAL, pid); 407 ev_child_set (RETVAL, pid);
398 if (!ix) evchild_start (RETVAL); 408 if (!ix) ev_child_start (RETVAL);
399 OUTPUT: 409 OUTPUT:
400 RETVAL 410 RETVAL
401 411
402 412
403PROTOTYPES: DISABLE 413PROTOTYPES: DISABLE
… …
415 sv_setsv (w->cb_sv, new_cb); 425 sv_setsv (w->cb_sv, new_cb);
416} 426}
417 OUTPUT: 427 OUTPUT:
418 RETVAL 428 RETVAL
419 429
430void trigger (struct ev_watcher *w, int revents = EV_NONE)
431 CODE:
432 w->cb (w, revents);
433
420MODULE = EV PACKAGE = EV::IO PREFIX = evio_ 434MODULE = EV PACKAGE = EV::Io PREFIX = ev_io_
421 435
422void evio_start (struct ev_io *w) 436void ev_io_start (struct ev_io *w)
423 437
424void evio_stop (struct ev_io *w) 438void ev_io_stop (struct ev_io *w)
425 439
426void DESTROY (struct ev_io *w) 440void DESTROY (struct ev_io *w)
427 CODE: 441 CODE:
428 evio_stop (w); 442 ev_io_stop (w);
429 443
430void set (struct ev_io *w, SV *fh, int events) 444void set (struct ev_io *w, SV *fh, int events)
431 CODE: 445 CODE:
432{ 446{
433 int active = w->active; 447 int active = w->active;
448 int fd = sv_fileno (fh);
449 CHECK_FD (fh, fd);
450
434 if (active) evio_stop (w); 451 if (active) ev_io_stop (w);
435 452
436 sv_setsv (w->fh, fh); 453 sv_setsv (w->fh, fh);
437 evio_set (w, sv_fileno (w->fh), events); 454 ev_io_set (w, fd, events);
438 455
439 if (active) evio_start (w); 456 if (active) ev_io_start (w);
440} 457}
441 458
442SV *fh (struct ev_io *w, SV *new_fh = 0) 459SV *fh (struct ev_io *w, SV *new_fh = 0)
443 CODE: 460 CODE:
444{ 461{
445 RETVAL = newSVsv (w->fh); 462 RETVAL = newSVsv (w->fh);
446 463
447 if (items > 1) 464 if (items > 1)
448 { 465 {
449 int active = w->active; 466 int active = w->active;
450 if (active) evio_stop (w); 467 if (active) ev_io_stop (w);
451 468
452 sv_setsv (w->fh, new_fh); 469 sv_setsv (w->fh, new_fh);
453 evio_set (w, sv_fileno (w->fh), w->events); 470 ev_io_set (w, sv_fileno (w->fh), w->events);
454 471
455 if (active) evio_start (w); 472 if (active) ev_io_start (w);
456 } 473 }
457} 474}
458 OUTPUT: 475 OUTPUT:
459 RETVAL 476 RETVAL
460 477
… …
464 RETVAL = w->events; 481 RETVAL = w->events;
465 482
466 if (items > 1) 483 if (items > 1)
467 { 484 {
468 int active = w->active; 485 int active = w->active;
469 if (active) evio_stop (w); 486 if (active) ev_io_stop (w);
470 487
471 evio_set (w, w->fd, new_events); 488 ev_io_set (w, w->fd, new_events);
472 489
473 if (active) evio_start (w); 490 if (active) ev_io_start (w);
474 } 491 }
475} 492}
476 OUTPUT: 493 OUTPUT:
477 RETVAL 494 RETVAL
478 495
479MODULE = EV PACKAGE = EV::Signal PREFIX = evsignal_ 496MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_
480 497
481void evsignal_start (struct ev_signal *w) 498void ev_signal_start (struct ev_signal *w)
482 499
483void evsignal_stop (struct ev_signal *w) 500void ev_signal_stop (struct ev_signal *w)
484 501
485void DESTROY (struct ev_signal *w) 502void DESTROY (struct ev_signal *w)
486 CODE: 503 CODE:
487 evsignal_stop (w); 504 ev_signal_stop (w);
488 505
489void set (struct ev_signal *w, SV *signal = 0) 506void set (struct ev_signal *w, SV *signal = 0)
490 CODE: 507 CODE:
491{ 508{
492 Signal signum = sv_signum (signal); /* may croak here */ 509 Signal signum = sv_signum (signal); /* may croak here */
493 int active = w->active; 510 int active = w->active;
494 511
495 if (active) evsignal_stop (w); 512 if (active) ev_signal_stop (w);
496 evsignal_set (w, signum); 513 ev_signal_set (w, signum);
497 if (active) evsignal_start (w); 514 if (active) ev_signal_start (w);
498} 515}
499 516
500MODULE = EV PACKAGE = EV::Time 517MODULE = EV PACKAGE = EV::Time
501 518
502MODULE = EV PACKAGE = EV::Timer PREFIX = evtimer_ 519MODULE = EV PACKAGE = EV::Timer PREFIX = ev_timer_
503 520
504void evtimer_start (struct ev_timer *w) 521void ev_timer_start (struct ev_timer *w)
505 INIT: 522 INIT:
506 CHECK_REPEAT (w->repeat); 523 CHECK_REPEAT (w->repeat);
507 524
508void evtimer_stop (struct ev_timer *w) 525void ev_timer_stop (struct ev_timer *w)
509 526
510void evtimer_again (struct ev_timer *w) 527void ev_timer_again (struct ev_timer *w)
511 INIT: 528 INIT:
512 CHECK_REPEAT (w->repeat); 529 CHECK_REPEAT (w->repeat);
513 530
514void DESTROY (struct ev_timer *w) 531void DESTROY (struct ev_timer *w)
515 CODE: 532 CODE:
516 evtimer_stop (w); 533 ev_timer_stop (w);
517 534
518void set (struct ev_timer *w, NV after, NV repeat = 0.) 535void set (struct ev_timer *w, NV after, NV repeat = 0.)
519 INIT: 536 INIT:
520 CHECK_REPEAT (repeat); 537 CHECK_REPEAT (repeat);
521 CODE: 538 CODE:
522{ 539{
523 int active = w->active; 540 int active = w->active;
524 if (active) evtimer_stop (w); 541 if (active) ev_timer_stop (w);
525 evtimer_set (w, after, repeat); 542 ev_timer_set (w, after, repeat);
526 if (active) evtimer_start (w); 543 if (active) ev_timer_start (w);
527} 544}
528 545
529MODULE = EV PACKAGE = EV::Periodic PREFIX = evperiodic_ 546MODULE = EV PACKAGE = EV::Periodic PREFIX = ev_periodic_
530 547
531void evperiodic_start (struct ev_periodic *w) 548void ev_periodic_start (struct ev_periodic *w)
532 INIT: 549 INIT:
533 CHECK_REPEAT (w->interval); 550 CHECK_REPEAT (w->interval);
534 551
535void evperiodic_stop (struct ev_periodic *w) 552void ev_periodic_stop (struct ev_periodic *w)
536 553
537void DESTROY (struct ev_periodic *w) 554void DESTROY (struct ev_periodic *w)
538 CODE: 555 CODE:
539 evperiodic_stop (w); 556 ev_periodic_stop (w);
540 557
541void set (struct ev_periodic *w, NV at, NV interval = 0.) 558void set (struct ev_periodic *w, NV at, NV interval = 0.)
542 INIT: 559 INIT:
543 CHECK_REPEAT (interval); 560 CHECK_REPEAT (interval);
544 CODE: 561 CODE:
545{ 562{
546 int active = w->active; 563 int active = w->active;
547 if (active) evperiodic_stop (w); 564 if (active) ev_periodic_stop (w);
548 evperiodic_set (w, at, interval); 565 ev_periodic_set (w, at, interval);
549 if (active) evperiodic_start (w); 566 if (active) ev_periodic_start (w);
550} 567}
551 568
552MODULE = EV PACKAGE = EV::Idle PREFIX = evidle_ 569MODULE = EV PACKAGE = EV::Idle PREFIX = ev_idle_
553 570
554void evidle_start (struct ev_idle *w) 571void ev_idle_start (struct ev_idle *w)
555 572
556void evidle_stop (struct ev_idle *w) 573void ev_idle_stop (struct ev_idle *w)
557 574
558void DESTROY (struct ev_idle *w) 575void DESTROY (struct ev_idle *w)
559 CODE: 576 CODE:
560 evidle_stop (w); 577 ev_idle_stop (w);
561 578
562MODULE = EV PACKAGE = EV::Prepare PREFIX = evcheck_ 579MODULE = EV PACKAGE = EV::Prepare PREFIX = ev_check_
563 580
564void evprepare_start (struct ev_prepare *w) 581void ev_prepare_start (struct ev_prepare *w)
565 582
566void evprepare_stop (struct ev_prepare *w) 583void ev_prepare_stop (struct ev_prepare *w)
567 584
568void DESTROY (struct ev_prepare *w) 585void DESTROY (struct ev_prepare *w)
569 CODE: 586 CODE:
570 evidle_prepare (w); 587 ev_prepare_stop (w);
571 588
572MODULE = EV PACKAGE = EV::Check PREFIX = evcheck_ 589MODULE = EV PACKAGE = EV::Check PREFIX = ev_check_
573 590
574void evcheck_start (struct ev_check *w) 591void ev_check_start (struct ev_check *w)
575 592
576void evcheck_stop (struct ev_check *w) 593void ev_check_stop (struct ev_check *w)
577 594
578void DESTROY (struct ev_check *w) 595void DESTROY (struct ev_check *w)
579 CODE: 596 CODE:
580 evidle_check (w); 597 ev_check_stop (w);
581 598
582MODULE = EV PACKAGE = EV::Child PREFIX = evchild_ 599MODULE = EV PACKAGE = EV::Child PREFIX = ev_child_
583 600
584void evchild_start (struct ev_child *w) 601void ev_child_start (struct ev_child *w)
585 602
586void evchild_stop (struct ev_child *w) 603void ev_child_stop (struct ev_child *w)
587 604
588void DESTROY (struct ev_child *w) 605void DESTROY (struct ev_child *w)
589 CODE: 606 CODE:
590 evidle_child (w); 607 ev_child_stop (w);
591 608
592void set (struct ev_child *w, int pid) 609void set (struct ev_child *w, int pid)
593 CODE: 610 CODE:
594{ 611{
595 int active = w->active; 612 int active = w->active;
596 if (active) evchild_stop (w); 613 if (active) ev_child_stop (w);
597 evchild_set (w, pid); 614 ev_child_set (w, pid);
598 if (active) evchild_start (w); 615 if (active) ev_child_start (w);
599} 616}
600 617
601int status (struct ev_child *w) 618int status (struct ev_child *w)
602 CODE: 619 CODE:
603 RETVAL = w->status; 620 RETVAL = w->status;

Diff Legend

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