ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.66 by root, Tue Sep 12 22:43:31 2006 UTC vs.
Revision 1.91 by elmex, Sun Dec 17 22:03:44 2006 UTC

5use Storable; 5use Storable;
6use Opcode; 6use Opcode;
7use Safe; 7use Safe;
8use Safe::Hole; 8use Safe::Hole;
9 9
10use IO::AIO ();
11use YAML::Syck ();
10use Time::HiRes; 12use Time::HiRes;
11use Event; 13use Event;
12$Event::Eval = 1; # no idea why this is required, but it is 14$Event::Eval = 1; # no idea why this is required, but it is
13 15
16# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
17$YAML::Syck::ImplicitUnicode = 1;
18
14use strict; 19use strict;
15 20
21sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
22
23our %COMMAND = ();
24our %COMMAND_TIME = ();
25our %EXTCMD = ();
26
16_init_vars; 27_init_vars;
17 28
18our %COMMAND = ();
19our @EVENT; 29our @EVENT;
20our $LIBDIR = maps_directory "perl"; 30our $LIBDIR = datadir . "/ext";
21 31
22our $TICK = MAX_TIME * 1e-6; 32our $TICK = MAX_TIME * 1e-6;
23our $TICK_WATCHER; 33our $TICK_WATCHER;
24our $NEXT_TICK; 34our $NEXT_TICK;
35
36our %CFG;
37
38our $UPTIME; $UPTIME ||= time;
39
40#############################################################################
41
42=head2 GLOBAL VARIABLES
43
44=over 4
45
46=item $cf::UPTIME
47
48The timestamp of the server start (so not actually an uptime).
49
50=item $cf::LIBDIR
51
52The perl library directory, where extensions and cf-specific modules can
53be found. It will be added to C<@INC> automatically.
54
55=item $cf::TICK
56
57The interval between server ticks, in seconds.
58
59=item %cf::CFG
60
61Configuration for the server, loaded from C</etc/crossfire/config>, or
62from wherever your confdir points to.
63
64=back
65
66=cut
25 67
26BEGIN { 68BEGIN {
27 *CORE::GLOBAL::warn = sub { 69 *CORE::GLOBAL::warn = sub {
28 my $msg = join "", @_; 70 my $msg = join "", @_;
29 $msg .= "\n" 71 $msg .= "\n"
36 78
37@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 79@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
38 80
39# we bless all objects into (empty) derived classes to force a method lookup 81# we bless all objects into (empty) derived classes to force a method lookup
40# within the Safe compartment. 82# within the Safe compartment.
41for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) { 83for my $pkg (qw(
84 cf::object cf::object::player
85 cf::client cf::player
86 cf::arch cf::living
87 cf::map cf::party cf::region
88)) {
42 no strict 'refs'; 89 no strict 'refs';
43 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 90 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
44} 91}
45 92
46$Event::DIED = sub { 93$Event::DIED = sub {
48}; 95};
49 96
50my %ext_pkg; 97my %ext_pkg;
51my @exts; 98my @exts;
52my @hook; 99my @hook;
53my %command;
54my %extcmd;
55 100
56############################################################################# 101=head2 UTILITY FUNCTIONS
57# utility functions 102
103=over 4
104
105=cut
58 106
59use JSON::Syck (); # TODO# replace by JSON::PC once working 107use JSON::Syck (); # TODO# replace by JSON::PC once working
108
109=item $ref = cf::from_json $json
110
111Converts a JSON string into the corresponding perl data structure.
112
113=cut
60 114
61sub from_json($) { 115sub from_json($) {
62 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs 116 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
63 JSON::Syck::Load $_[0] 117 JSON::Syck::Load $_[0]
64} 118}
65 119
120=item $json = cf::to_json $ref
121
122Converts a perl data structure into its JSON representation.
123
124=cut
125
66sub to_json($) { 126sub to_json($) {
67 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 127 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
68 JSON::Syck::Dump $_[0] 128 JSON::Syck::Dump $_[0]
69} 129}
70 130
131=back
132
133=cut
134
71############################################################################# 135#############################################################################
72# "new" plug-in system
73 136
74=head3 EVENTS AND OBJECT ATTACHMENTS 137=head2 EVENTS AND OBJECT ATTACHMENTS
75 138
76=over 4 139=over 4
77 140
78=item $object->attach ($attachment, key => $value...) 141=item $object->attach ($attachment, key => $value...)
79 142
379removed in future versions), and there is no public API to access override 442removed in future versions), and there is no public API to access override
380results (if you must, access C<@cf::invoke_results> directly). 443results (if you must, access C<@cf::invoke_results> directly).
381 444
382=back 445=back
383 446
384=head2 methods valid for all pointers 447=cut
448
449#############################################################################
450
451=head2 METHODS VALID FOR ALL CORE OBJECTS
385 452
386=over 4 453=over 4
387 454
388=item $object->valid 455=item $object->valid, $player->valid, $map->valid
389
390=item $player->valid
391
392=item $map->valid
393 456
394Just because you have a perl object does not mean that the corresponding 457Just because you have a perl object does not mean that the corresponding
395C-level object still exists. If you try to access an object that has no 458C-level object still exists. If you try to access an object that has no
396valid C counterpart anymore you get an exception at runtime. This method 459valid C counterpart anymore you get an exception at runtime. This method
397can be used to test for existence of the C object part without causing an 460can be used to test for existence of the C object part without causing an
470 unlink $filename; 533 unlink $filename;
471 unlink "$filename.pst"; 534 unlink "$filename.pst";
472 } 535 }
473} 536}
474 537
538sub object_freezer_as_string {
539 my ($rdata, $objs) = @_;
540
541 use Data::Dumper;
542
543 $$rdata . Dumper $objs
544}
545
475sub object_thawer_load { 546sub object_thawer_load {
476 my ($filename) = @_; 547 my ($filename) = @_;
477 548
478 local $/; 549 local $/;
479 550
504 if exists $src->{_attachment}; 575 if exists $src->{_attachment};
505 }, 576 },
506; 577;
507 578
508############################################################################# 579#############################################################################
509# old plug-in events 580# command handling &c
510 581
511sub inject_event { 582=item cf::register_command $name => \&callback($ob,$args);
512 my $extension = shift;
513 my $event_code = shift;
514 583
515 my $cb = $hook[$event_code]{$extension} 584Register a callback for execution when the client sends the user command
516 or return; 585$name.
517 586
518 &$cb 587=cut
519}
520
521sub inject_global_event {
522 my $event = shift;
523
524 my $cb = $hook[$event]
525 or return;
526
527 List::Util::max map &$_, values %$cb
528}
529
530sub inject_command {
531 my ($name, $obj, $params) = @_;
532
533 for my $cmd (@{ $command{$name} }) {
534 $cmd->[1]->($obj, $params);
535 }
536
537 -1
538}
539 588
540sub register_command { 589sub register_command {
541 my ($name, $time, $cb) = @_; 590 my ($name, $cb) = @_;
542 591
543 my $caller = caller; 592 my $caller = caller;
544 #warn "registering command '$name/$time' to '$caller'"; 593 #warn "registering command '$name/$time' to '$caller'";
545 594
546 push @{ $command{$name} }, [$time, $cb, $caller]; 595 push @{ $COMMAND{$name} }, [$caller, $cb];
547 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
548} 596}
597
598=item cf::register_extcmd $name => \&callback($pl,$packet);
599
600Register a callbackf ro execution when the client sends an extcmd packet.
601
602If the callback returns something, it is sent back as if reply was being
603called.
604
605=cut
549 606
550sub register_extcmd { 607sub register_extcmd {
551 my ($name, $cb) = @_; 608 my ($name, $cb) = @_;
552 609
553 my $caller = caller; 610 my $caller = caller;
554 #warn "registering extcmd '$name' to '$caller'"; 611 #warn "registering extcmd '$name' to '$caller'";
555 612
556 $extcmd{$name} = [$cb, $caller]; 613 $EXTCMD{$name} = [$cb, $caller];
557} 614}
615
616attach_to_players
617 on_command => sub {
618 my ($pl, $name, $params) = @_;
619
620 my $cb = $COMMAND{$name}
621 or return;
622
623 for my $cmd (@$cb) {
624 $cmd->[1]->($pl->ob, $params);
625 }
626
627 cf::override;
628 },
629 on_extcmd => sub {
630 my ($pl, $buf) = @_;
631
632 my $msg = eval { from_json $buf };
633
634 if (ref $msg) {
635 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
636 if (my %reply = $cb->[0]->($pl, $msg)) {
637 $pl->ext_reply ($msg->{msgid}, %reply);
638 }
639 }
640 } else {
641 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
642 }
643
644 cf::override;
645 },
646;
558 647
559sub register { 648sub register {
560 my ($base, $pkg) = @_; 649 my ($base, $pkg) = @_;
561 650
562 #TODO 651 #TODO
581 . "#line 1 \"$path\"\n{\n" 670 . "#line 1 \"$path\"\n{\n"
582 . (do { local $/; <$fh> }) 671 . (do { local $/; <$fh> })
583 . "\n};\n1"; 672 . "\n};\n1";
584 673
585 eval $source 674 eval $source
586 or die "$path: $@"; 675 or die $@ ? "$path: $@\n"
676 : "extension disabled.\n";
587 677
588 push @exts, $pkg; 678 push @exts, $pkg;
589 $ext_pkg{$base} = $pkg; 679 $ext_pkg{$base} = $pkg;
590 680
591# no strict 'refs'; 681# no strict 'refs';
604# for my $idx (0 .. $#PLUGIN_EVENT) { 694# for my $idx (0 .. $#PLUGIN_EVENT) {
605# delete $hook[$idx]{$pkg}; 695# delete $hook[$idx]{$pkg};
606# } 696# }
607 697
608 # remove commands 698 # remove commands
609 for my $name (keys %command) { 699 for my $name (keys %COMMAND) {
610 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 700 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
611 701
612 if (@cb) { 702 if (@cb) {
613 $command{$name} = \@cb; 703 $COMMAND{$name} = \@cb;
614 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
615 } else { 704 } else {
616 delete $command{$name};
617 delete $COMMAND{"$name\000"}; 705 delete $COMMAND{$name};
618 } 706 }
619 } 707 }
620 708
621 # remove extcmds 709 # remove extcmds
622 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 710 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
623 delete $extcmd{$name}; 711 delete $EXTCMD{$name};
624 } 712 }
625 713
626 if (my $cb = $pkg->can ("unload")) { 714 if (my $cb = $pkg->can ("unload")) {
627 eval { 715 eval {
628 $cb->($pkg); 716 $cb->($pkg);
632 720
633 Symbol::delete_package $pkg; 721 Symbol::delete_package $pkg;
634} 722}
635 723
636sub load_extensions { 724sub load_extensions {
637 my $LIBDIR = maps_directory "perl";
638
639 for my $ext (<$LIBDIR/*.ext>) { 725 for my $ext (<$LIBDIR/*.ext>) {
640 next unless -r $ext; 726 next unless -r $ext;
641 eval { 727 eval {
642 load_extension $ext; 728 load_extension $ext;
643 1 729 1
644 } or warn "$ext not loaded: $@"; 730 } or warn "$ext not loaded: $@";
645 } 731 }
646} 732}
647 733
648############################################################################# 734#############################################################################
649# extcmd framework, basically convert ext <msg>
650# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
651
652attach_to_players
653 on_extcmd => sub {
654 my ($pl, $buf) = @_;
655
656 my $msg = eval { from_json $buf };
657
658 if (ref $msg) {
659 if (my $cb = $extcmd{$msg->{msgtype}}) {
660 if (my %reply = $cb->[0]->($pl, $msg)) {
661 $pl->ext_reply ($msg->{msgid}, %reply);
662 }
663 }
664 } else {
665 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
666 }
667
668 cf::override;
669 },
670;
671
672#############################################################################
673# load/save/clean perl data associated with a map 735# load/save/clean perl data associated with a map
674 736
675*cf::mapsupport::on_clean = sub { 737*cf::mapsupport::on_clean = sub {
676 my ($map) = @_; 738 my ($map) = @_;
677 739
704 } 766 }
705 }, 767 },
706; 768;
707 769
708############################################################################# 770#############################################################################
709# core extensions - in perl 771
772=head2 CORE EXTENSIONS
773
774Functions and methods that extend core crossfire objects.
775
776=over 4
710 777
711=item cf::player::exists $login 778=item cf::player::exists $login
712 779
713Returns true when the given account exists. 780Returns true when the given account exists.
714 781
717sub cf::player::exists($) { 784sub cf::player::exists($) {
718 cf::player::find $_[0] 785 cf::player::find $_[0]
719 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 786 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
720} 787}
721 788
722=item $player->reply ($npc, $msg[, $flags]) 789=item $player_object->reply ($npc, $msg[, $flags])
723 790
724Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 791Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
725can be C<undef>. Does the right thing when the player is currently in a 792can be C<undef>. Does the right thing when the player is currently in a
726dialogue with the given NPC character. 793dialogue with the given NPC character.
727 794
754 $msg{msgid} = $id; 821 $msg{msgid} = $id;
755 822
756 $self->send ("ext " . to_json \%msg); 823 $self->send ("ext " . to_json \%msg);
757} 824}
758 825
826=item $player_object->may ("access")
827
828Returns wether the given player is authorized to access resource "access"
829(e.g. "command_wizcast").
830
831=cut
832
833sub cf::object::player::may {
834 my ($self, $access) = @_;
835
836 $self->flag (cf::FLAG_WIZ) ||
837 (ref $cf::CFG{"may_$access"}
838 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
839 : $cf::CFG{"may_$access"})
840}
841
842=cut
843
759############################################################################# 844#############################################################################
760# map scripting support 845
846=head2 SAFE SCRIPTING
847
848Functions that provide a safe environment to compile and execute
849snippets of perl code without them endangering the safety of the server
850itself. Looping constructs, I/O operators and other built-in functionality
851is not available in the safe scripting environment, and the number of
852functions and methods that can be called is greatly reduced.
853
854=cut
761 855
762our $safe = new Safe "safe"; 856our $safe = new Safe "safe";
763our $safe_hole = new Safe::Hole; 857our $safe_hole = new Safe::Hole;
764 858
765$SIG{FPE} = 'IGNORE'; 859$SIG{FPE} = 'IGNORE';
766 860
767$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 861$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
768 862
769# here we export the classes and methods available to script code 863# here we export the classes and methods available to script code
770 864
865=pod
866
867The following fucntions and emthods are available within a safe environment:
868
869 cf::object contr pay_amount pay_player map
870 cf::object::player player
871 cf::player peaceful
872 cf::map trigger
873
874=cut
875
771for ( 876for (
772 ["cf::object" => qw(contr pay_amount pay_player)], 877 ["cf::object" => qw(contr pay_amount pay_player map)],
773 ["cf::object::player" => qw(player)], 878 ["cf::object::player" => qw(player)],
774 ["cf::player" => qw(peaceful)], 879 ["cf::player" => qw(peaceful)],
880 ["cf::map" => qw(trigger)],
775) { 881) {
776 no strict 'refs'; 882 no strict 'refs';
777 my ($pkg, @funs) = @$_; 883 my ($pkg, @funs) = @$_;
778 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 884 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
779 for @funs; 885 for @funs;
780} 886}
887
888=over 4
889
890=item @retval = safe_eval $code, [var => value, ...]
891
892Compiled and executes the given perl code snippet. additional var/value
893pairs result in temporary local (my) scalar variables of the given name
894that are available in the code snippet. Example:
895
896 my $five = safe_eval '$first + $second', first => 1, second => 4;
897
898=cut
781 899
782sub safe_eval($;@) { 900sub safe_eval($;@) {
783 my ($code, %vars) = @_; 901 my ($code, %vars) = @_;
784 902
785 my $qcode = $code; 903 my $qcode = $code;
808 } 926 }
809 927
810 wantarray ? @res : $res[0] 928 wantarray ? @res : $res[0]
811} 929}
812 930
931=item cf::register_script_function $function => $cb
932
933Register a function that can be called from within map/npc scripts. The
934function should be reasonably secure and should be put into a package name
935like the extension.
936
937Example: register a function that gets called whenever a map script calls
938C<rent::overview>, as used by the C<rent> extension.
939
940 cf::register_script_function "rent::overview" => sub {
941 ...
942 };
943
944=cut
945
813sub register_script_function { 946sub register_script_function {
814 my ($fun, $cb) = @_; 947 my ($fun, $cb) = @_;
815 948
816 no strict 'refs'; 949 no strict 'refs';
817 *{"safe::$fun"} = $safe_hole->wrap ($cb); 950 *{"safe::$fun"} = $safe_hole->wrap ($cb);
818} 951}
952
953=back
954
955=cut
819 956
820############################################################################# 957#############################################################################
821 958
822=head2 EXTENSION DATABASE SUPPORT 959=head2 EXTENSION DATABASE SUPPORT
823 960
858 995
859Immediately write the database to disk I<if it is dirty>. 996Immediately write the database to disk I<if it is dirty>.
860 997
861=cut 998=cut
862 999
1000our $DB;
1001
863{ 1002{
864 my $db;
865 my $path = cf::localdir . "/database.pst"; 1003 my $path = cf::localdir . "/database.pst";
866 1004
867 sub db_load() { 1005 sub db_load() {
868 warn "loading database $path\n";#d# remove later 1006 warn "loading database $path\n";#d# remove later
869 $db = stat $path ? Storable::retrieve $path : { }; 1007 $DB = stat $path ? Storable::retrieve $path : { };
870 } 1008 }
871 1009
872 my $pid; 1010 my $pid;
873 1011
874 sub db_save() { 1012 sub db_save() {
875 warn "saving database $path\n";#d# remove later 1013 warn "saving database $path\n";#d# remove later
876 waitpid $pid, 0 if $pid; 1014 waitpid $pid, 0 if $pid;
877 unless ($pid = fork) { 1015 if (0 == ($pid = fork)) {
878 $db->{_meta}{version} = 1; 1016 $DB->{_meta}{version} = 1;
879 Storable::nstore $db, "$path~"; 1017 Storable::nstore $DB, "$path~";
880 rename "$path~", $path; 1018 rename "$path~", $path;
881 cf::_exit 0 if defined $pid; 1019 cf::_exit 0 if defined $pid;
882 } 1020 }
883 } 1021 }
884 1022
887 sub db_sync() { 1025 sub db_sync() {
888 db_save if $dirty; 1026 db_save if $dirty;
889 undef $dirty; 1027 undef $dirty;
890 } 1028 }
891 1029
892 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, cb => sub { 1030 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
893 db_sync; 1031 db_sync;
894 }); 1032 });
895 1033
896 sub db_dirty() { 1034 sub db_dirty() {
897 $dirty = 1; 1035 $dirty = 1;
898 $idle->start; 1036 $idle->start;
899 } 1037 }
900 1038
901 sub db_get($;$) { 1039 sub db_get($;$) {
902 @_ >= 2 1040 @_ >= 2
903 ? $db->{$_[0]}{$_[1]} 1041 ? $DB->{$_[0]}{$_[1]}
904 : ($db->{$_[0]} ||= { }) 1042 : ($DB->{$_[0]} ||= { })
905 } 1043 }
906 1044
907 sub db_put($$;$) { 1045 sub db_put($$;$) {
908 if (@_ >= 3) { 1046 if (@_ >= 3) {
909 $db->{$_[0]}{$_[1]} = $_[2]; 1047 $DB->{$_[0]}{$_[1]} = $_[2];
910 } else { 1048 } else {
911 $db->{$_[0]} = $_[1]; 1049 $DB->{$_[0]} = $_[1];
912 } 1050 }
913 db_dirty; 1051 db_dirty;
914 } 1052 }
1053
1054 attach_global
1055 prio => 10000,
1056 on_cleanup => sub {
1057 db_sync;
1058 },
1059 ;
915} 1060}
916 1061
917############################################################################# 1062#############################################################################
918# the server's main() 1063# the server's main()
919 1064
1065sub cfg_load {
1066 open my $fh, "<:utf8", cf::confdir . "/config"
1067 or return;
1068
1069 local $/;
1070 *CFG = YAML::Syck::Load <$fh>;
1071}
1072
920sub main { 1073sub main {
1074 cfg_load;
921 db_load; 1075 db_load;
922 load_extensions; 1076 load_extensions;
923 Event::loop; 1077 Event::loop;
924} 1078}
925 1079
931 1085
932 $msg->("reloading..."); 1086 $msg->("reloading...");
933 1087
934 eval { 1088 eval {
935 # cancel all watchers 1089 # cancel all watchers
936 $_->cancel for Event::all_watchers; 1090 for (Event::all_watchers) {
1091 $_->cancel if $_->data & WF_AUTOCANCEL;
1092 }
937 1093
938 # unload all extensions 1094 # unload all extensions
939 for (@exts) { 1095 for (@exts) {
940 $msg->("unloading <$_>"); 1096 $msg->("unloading <$_>");
941 unload_extension $_; 1097 unload_extension $_;
977 1133
978 # reload cf.pm 1134 # reload cf.pm
979 $msg->("reloading cf.pm"); 1135 $msg->("reloading cf.pm");
980 require cf; 1136 require cf;
981 1137
982 # load database again 1138 # load config and database again
1139 cf::cfg_load;
983 cf::db_load; 1140 cf::db_load;
984 1141
985 # load extensions 1142 # load extensions
986 $msg->("load extensions"); 1143 $msg->("load extensions");
987 cf::load_extensions; 1144 cf::load_extensions;
1000 warn $_[0]; 1157 warn $_[0];
1001 print "$_[0]\n"; 1158 print "$_[0]\n";
1002 }; 1159 };
1003} 1160}
1004 1161
1162register "<global>", __PACKAGE__;
1163
1005register_command "perl-reload", 0, sub { 1164register_command "perl-reload" => sub {
1006 my ($who, $arg) = @_; 1165 my ($who, $arg) = @_;
1007 1166
1008 if ($who->flag (FLAG_WIZ)) { 1167 if ($who->flag (FLAG_WIZ)) {
1009 _perl_reload { 1168 _perl_reload {
1010 warn $_[0]; 1169 warn $_[0];
1011 $who->message ($_[0]); 1170 $who->message ($_[0]);
1012 }; 1171 };
1013 } 1172 }
1014}; 1173};
1015 1174
1016register "<global>", __PACKAGE__;
1017
1018unshift @INC, $LIBDIR; 1175unshift @INC, $LIBDIR;
1019 1176
1020$TICK_WATCHER = Event->timer ( 1177$TICK_WATCHER = Event->timer (
1021 prio => 1, 1178 prio => 0,
1022 at => $NEXT_TICK || 1, 1179 at => $NEXT_TICK || 1,
1180 data => WF_AUTOCANCEL,
1023 cb => sub { 1181 cb => sub {
1024 cf::server_tick; # one server iteration 1182 cf::server_tick; # one server iteration
1025 1183
1026 my $NOW = Event::time; 1184 my $NOW = Event::time;
1027 $NEXT_TICK += $TICK; 1185 $NEXT_TICK += $TICK;
1028 1186
1029 # if we are delayed by four ticks, skip them all 1187 # if we are delayed by four ticks or more, skip them all
1030 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1188 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
1031 1189
1032 $TICK_WATCHER->at ($NEXT_TICK); 1190 $TICK_WATCHER->at ($NEXT_TICK);
1033 $TICK_WATCHER->start; 1191 $TICK_WATCHER->start;
1034 }, 1192 },
1035); 1193);
1036 1194
1195IO::AIO::max_poll_time $TICK * 0.2;
1196
1197Event->io (fd => IO::AIO::poll_fileno,
1198 poll => 'r',
1199 prio => 5,
1200 data => WF_AUTOCANCEL,
1201 cb => \&IO::AIO::poll_cb);
1202
10371 12031
1038 1204

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines