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.68 by root, Tue Sep 12 23:45:16 2006 UTC vs.
Revision 1.92 by root, Thu Dec 21 06:42:28 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
89 152
90=item $map->attach ($attachment, key => $value...) 153=item $map->attach ($attachment, key => $value...)
91 154
92=item $map->detach ($attachment) 155=item $map->detach ($attachment)
93 156
157Attach/detach a pre-registered attachment to a client.
158
159=item $client->attach ($attachment, key => $value...)
160
161=item $client->detach ($attachment)
162
94Attach/detach a pre-registered attachment to a map. 163Attach/detach a pre-registered attachment to a map.
95 164
96=item $bool = $object->attached ($name) 165=item $bool = $object->attached ($name)
97 166
98=item $bool = $player->attached ($name) 167=item $bool = $player->attached ($name)
168
169=item $bool = $client->attached ($name)
99 170
100=item $bool = $map->attached ($name) 171=item $bool = $map->attached ($name)
101 172
102Checks wether the named attachment is currently attached to the object. 173Checks wether the named attachment is currently attached to the object.
103 174
150 221
151=item cf::attach_to_players ... 222=item cf::attach_to_players ...
152 223
153Attach handlers to all players. 224Attach handlers to all players.
154 225
226=item cf::attach_to_clients ...
227
228Attach handlers to all players.
229
155=item cf::attach_to_maps ... 230=item cf::attach_to_maps ...
156 231
157Attach handlers to all maps. 232Attach handlers to all maps.
158 233
159=item cf:register_attachment $name, ... 234=item cf:register_attachment $name, ...
175 250
176# the following variables are defined in .xs and must not be re-created 251# the following variables are defined in .xs and must not be re-created
177our @CB_GLOBAL = (); # registry for all global events 252our @CB_GLOBAL = (); # registry for all global events
178our @CB_OBJECT = (); # all objects (should not be used except in emergency) 253our @CB_OBJECT = (); # all objects (should not be used except in emergency)
179our @CB_PLAYER = (); 254our @CB_PLAYER = ();
255our @CB_CLIENT = ();
180our @CB_TYPE = (); # registry for type (cf-object class) based events 256our @CB_TYPE = (); # registry for type (cf-object class) based events
181our @CB_MAP = (); 257our @CB_MAP = ();
182 258
183my %attachment; 259my %attachment;
184 260
267 $res 343 $res
268} 344}
269 345
270*cf::object::attach = 346*cf::object::attach =
271*cf::player::attach = 347*cf::player::attach =
348*cf::client::attach =
272*cf::map::attach = sub { 349*cf::map::attach = sub {
273 my ($obj, $name, %arg) = @_; 350 my ($obj, $name, %arg) = @_;
274 351
275 _attach_attachment $obj, $name, %arg; 352 _attach_attachment $obj, $name, %arg;
276}; 353};
277 354
278# all those should be optimised 355# all those should be optimised
279*cf::object::detach = 356*cf::object::detach =
280*cf::player::detach = 357*cf::player::detach =
358*cf::client::detach =
281*cf::map::detach = sub { 359*cf::map::detach = sub {
282 my ($obj, $name) = @_; 360 my ($obj, $name) = @_;
283 361
284 delete $obj->{_attachment}{$name}; 362 delete $obj->{_attachment}{$name};
285 reattach ($obj); 363 reattach ($obj);
286}; 364};
287 365
288*cf::object::attached = 366*cf::object::attached =
289*cf::player::attached = 367*cf::player::attached =
368*cf::client::attached =
290*cf::map::attached = sub { 369*cf::map::attached = sub {
291 my ($obj, $name) = @_; 370 my ($obj, $name) = @_;
292 371
293 exists $obj->{_attachment}{$name} 372 exists $obj->{_attachment}{$name}
294}; 373};
310 389
311sub attach_to_players { 390sub attach_to_players {
312 _attach @CB_PLAYER, KLASS_PLAYER, @_ 391 _attach @CB_PLAYER, KLASS_PLAYER, @_
313} 392}
314 393
394sub attach_to_clients {
395 _attach @CB_CLIENT, KLASS_CLIENT, @_
396}
397
315sub attach_to_maps { 398sub attach_to_maps {
316 _attach @CB_MAP, KLASS_MAP, @_ 399 _attach @CB_MAP, KLASS_MAP, @_
317} 400}
318 401
319sub register_attachment { 402sub register_attachment {
324 407
325sub register_player_attachment { 408sub register_player_attachment {
326 my $name = shift; 409 my $name = shift;
327 410
328 $attachment{$name} = [[KLASS_PLAYER, @_]]; 411 $attachment{$name} = [[KLASS_PLAYER, @_]];
412}
413
414sub register_client_attachment {
415 my $name = shift;
416
417 $attachment{$name} = [[KLASS_CLIENT, @_]];
329} 418}
330 419
331sub register_map_attachment { 420sub register_map_attachment {
332 my $name = shift; 421 my $name = shift;
333 422
369 458
370=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...) 459=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
371 460
372=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...) 461=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
373 462
463=item $bool = $client->invoke (EVENT_CLIENT_XXX, ...)
464
374=item $bool = $map->invoke (EVENT_MAP_XXX, ...) 465=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
375 466
376Generate a global/object/player/map-specific event with the given arguments. 467Generate a global/object/player/map-specific event with the given arguments.
377 468
378This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be 469This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
379removed in future versions), and there is no public API to access override 470removed in future versions), and there is no public API to access override
380results (if you must, access C<@cf::invoke_results> directly). 471results (if you must, access C<@cf::invoke_results> directly).
381 472
382=back 473=back
383 474
384=head2 methods valid for all pointers 475=cut
476
477#############################################################################
478
479=head2 METHODS VALID FOR ALL CORE OBJECTS
385 480
386=over 4 481=over 4
387 482
388=item $object->valid 483=item $object->valid, $player->valid, $client->valid, $map->valid
389
390=item $player->valid
391
392=item $map->valid
393 484
394Just because you have a perl object does not mean that the corresponding 485Just 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 486C-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 487valid 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 488can be used to test for existence of the C object part without causing an
401 492
402=cut 493=cut
403 494
404*cf::object::valid = 495*cf::object::valid =
405*cf::player::valid = 496*cf::player::valid =
497*cf::client::valid =
406*cf::map::valid = \&cf::_valid; 498*cf::map::valid = \&cf::_valid;
407 499
408############################################################################# 500#############################################################################
409# object support 501# object support
410 502
470 unlink $filename; 562 unlink $filename;
471 unlink "$filename.pst"; 563 unlink "$filename.pst";
472 } 564 }
473} 565}
474 566
567sub object_freezer_as_string {
568 my ($rdata, $objs) = @_;
569
570 use Data::Dumper;
571
572 $$rdata . Dumper $objs
573}
574
475sub object_thawer_load { 575sub object_thawer_load {
476 my ($filename) = @_; 576 my ($filename) = @_;
477 577
478 local $/; 578 local $/;
479 579
504 if exists $src->{_attachment}; 604 if exists $src->{_attachment};
505 }, 605 },
506; 606;
507 607
508############################################################################# 608#############################################################################
509# old plug-in events 609# command handling &c
510 610
511sub inject_event { 611=item cf::register_command $name => \&callback($ob,$args);
512 my $extension = shift;
513 my $event_code = shift;
514 612
515 my $cb = $hook[$event_code]{$extension} 613Register a callback for execution when the client sends the user command
516 or return; 614$name.
517 615
518 &$cb 616=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 617
540sub register_command { 618sub register_command {
541 my ($name, $time, $cb) = @_; 619 my ($name, $cb) = @_;
542 620
543 my $caller = caller; 621 my $caller = caller;
544 #warn "registering command '$name/$time' to '$caller'"; 622 #warn "registering command '$name/$time' to '$caller'";
545 623
546 push @{ $command{$name} }, [$time, $cb, $caller]; 624 push @{ $COMMAND{$name} }, [$caller, $cb];
547 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
548} 625}
626
627=item cf::register_extcmd $name => \&callback($pl,$packet);
628
629Register a callbackf ro execution when the client sends an extcmd packet.
630
631If the callback returns something, it is sent back as if reply was being
632called.
633
634=cut
549 635
550sub register_extcmd { 636sub register_extcmd {
551 my ($name, $cb) = @_; 637 my ($name, $cb) = @_;
552 638
553 my $caller = caller; 639 my $caller = caller;
554 #warn "registering extcmd '$name' to '$caller'"; 640 #warn "registering extcmd '$name' to '$caller'";
555 641
556 $extcmd{$name} = [$cb, $caller]; 642 $EXTCMD{$name} = [$cb, $caller];
557} 643}
644
645attach_to_players
646 on_command => sub {
647 my ($pl, $name, $params) = @_;
648
649 my $cb = $COMMAND{$name}
650 or return;
651
652 for my $cmd (@$cb) {
653 $cmd->[1]->($pl->ob, $params);
654 }
655
656 cf::override;
657 },
658 on_extcmd => sub {
659 my ($pl, $buf) = @_;
660
661 my $msg = eval { from_json $buf };
662
663 if (ref $msg) {
664 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
665 if (my %reply = $cb->[0]->($pl, $msg)) {
666 $pl->ext_reply ($msg->{msgid}, %reply);
667 }
668 }
669 } else {
670 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
671 }
672
673 cf::override;
674 },
675;
558 676
559sub register { 677sub register {
560 my ($base, $pkg) = @_; 678 my ($base, $pkg) = @_;
561 679
562 #TODO 680 #TODO
581 . "#line 1 \"$path\"\n{\n" 699 . "#line 1 \"$path\"\n{\n"
582 . (do { local $/; <$fh> }) 700 . (do { local $/; <$fh> })
583 . "\n};\n1"; 701 . "\n};\n1";
584 702
585 eval $source 703 eval $source
586 or die "$path: $@"; 704 or die $@ ? "$path: $@\n"
705 : "extension disabled.\n";
587 706
588 push @exts, $pkg; 707 push @exts, $pkg;
589 $ext_pkg{$base} = $pkg; 708 $ext_pkg{$base} = $pkg;
590 709
591# no strict 'refs'; 710# no strict 'refs';
604# for my $idx (0 .. $#PLUGIN_EVENT) { 723# for my $idx (0 .. $#PLUGIN_EVENT) {
605# delete $hook[$idx]{$pkg}; 724# delete $hook[$idx]{$pkg};
606# } 725# }
607 726
608 # remove commands 727 # remove commands
609 for my $name (keys %command) { 728 for my $name (keys %COMMAND) {
610 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 729 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
611 730
612 if (@cb) { 731 if (@cb) {
613 $command{$name} = \@cb; 732 $COMMAND{$name} = \@cb;
614 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
615 } else { 733 } else {
616 delete $command{$name};
617 delete $COMMAND{"$name\000"}; 734 delete $COMMAND{$name};
618 } 735 }
619 } 736 }
620 737
621 # remove extcmds 738 # remove extcmds
622 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 739 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
623 delete $extcmd{$name}; 740 delete $EXTCMD{$name};
624 } 741 }
625 742
626 if (my $cb = $pkg->can ("unload")) { 743 if (my $cb = $pkg->can ("unload")) {
627 eval { 744 eval {
628 $cb->($pkg); 745 $cb->($pkg);
632 749
633 Symbol::delete_package $pkg; 750 Symbol::delete_package $pkg;
634} 751}
635 752
636sub load_extensions { 753sub load_extensions {
637 my $LIBDIR = maps_directory "perl";
638
639 for my $ext (<$LIBDIR/*.ext>) { 754 for my $ext (<$LIBDIR/*.ext>) {
640 next unless -r $ext; 755 next unless -r $ext;
641 eval { 756 eval {
642 load_extension $ext; 757 load_extension $ext;
643 1 758 1
644 } or warn "$ext not loaded: $@"; 759 } or warn "$ext not loaded: $@";
645 } 760 }
646} 761}
647 762
648############################################################################# 763#############################################################################
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 764# load/save/clean perl data associated with a map
674 765
675*cf::mapsupport::on_clean = sub { 766*cf::mapsupport::on_clean = sub {
676 my ($map) = @_; 767 my ($map) = @_;
677 768
704 } 795 }
705 }, 796 },
706; 797;
707 798
708############################################################################# 799#############################################################################
709# core extensions - in perl 800
801=head2 CORE EXTENSIONS
802
803Functions and methods that extend core crossfire objects.
804
805=over 4
710 806
711=item cf::player::exists $login 807=item cf::player::exists $login
712 808
713Returns true when the given account exists. 809Returns true when the given account exists.
714 810
717sub cf::player::exists($) { 813sub cf::player::exists($) {
718 cf::player::find $_[0] 814 cf::player::find $_[0]
719 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 815 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
720} 816}
721 817
722=item $player->reply ($npc, $msg[, $flags]) 818=item $player_object->reply ($npc, $msg[, $flags])
723 819
724Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 820Sends 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 821can be C<undef>. Does the right thing when the player is currently in a
726dialogue with the given NPC character. 822dialogue with the given NPC character.
727 823
754 $msg{msgid} = $id; 850 $msg{msgid} = $id;
755 851
756 $self->send ("ext " . to_json \%msg); 852 $self->send ("ext " . to_json \%msg);
757} 853}
758 854
855=item $player_object->may ("access")
856
857Returns wether the given player is authorized to access resource "access"
858(e.g. "command_wizcast").
859
860=cut
861
862sub cf::object::player::may {
863 my ($self, $access) = @_;
864
865 $self->flag (cf::FLAG_WIZ) ||
866 (ref $cf::CFG{"may_$access"}
867 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
868 : $cf::CFG{"may_$access"})
869}
870
871=cut
872
759############################################################################# 873#############################################################################
760# map scripting support 874
875=head2 SAFE SCRIPTING
876
877Functions that provide a safe environment to compile and execute
878snippets of perl code without them endangering the safety of the server
879itself. Looping constructs, I/O operators and other built-in functionality
880is not available in the safe scripting environment, and the number of
881functions and methods that can be called is greatly reduced.
882
883=cut
761 884
762our $safe = new Safe "safe"; 885our $safe = new Safe "safe";
763our $safe_hole = new Safe::Hole; 886our $safe_hole = new Safe::Hole;
764 887
765$SIG{FPE} = 'IGNORE'; 888$SIG{FPE} = 'IGNORE';
766 889
767$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 890$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
768 891
769# here we export the classes and methods available to script code 892# here we export the classes and methods available to script code
770 893
894=pod
895
896The following fucntions and emthods are available within a safe environment:
897
898 cf::object contr pay_amount pay_player map
899 cf::object::player player
900 cf::player peaceful
901 cf::map trigger
902
903=cut
904
771for ( 905for (
772 ["cf::object" => qw(contr pay_amount pay_player)], 906 ["cf::object" => qw(contr pay_amount pay_player map)],
773 ["cf::object::player" => qw(player)], 907 ["cf::object::player" => qw(player)],
774 ["cf::player" => qw(peaceful)], 908 ["cf::player" => qw(peaceful)],
909 ["cf::map" => qw(trigger)],
775) { 910) {
776 no strict 'refs'; 911 no strict 'refs';
777 my ($pkg, @funs) = @$_; 912 my ($pkg, @funs) = @$_;
778 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 913 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
779 for @funs; 914 for @funs;
780} 915}
916
917=over 4
918
919=item @retval = safe_eval $code, [var => value, ...]
920
921Compiled and executes the given perl code snippet. additional var/value
922pairs result in temporary local (my) scalar variables of the given name
923that are available in the code snippet. Example:
924
925 my $five = safe_eval '$first + $second', first => 1, second => 4;
926
927=cut
781 928
782sub safe_eval($;@) { 929sub safe_eval($;@) {
783 my ($code, %vars) = @_; 930 my ($code, %vars) = @_;
784 931
785 my $qcode = $code; 932 my $qcode = $code;
808 } 955 }
809 956
810 wantarray ? @res : $res[0] 957 wantarray ? @res : $res[0]
811} 958}
812 959
960=item cf::register_script_function $function => $cb
961
962Register a function that can be called from within map/npc scripts. The
963function should be reasonably secure and should be put into a package name
964like the extension.
965
966Example: register a function that gets called whenever a map script calls
967C<rent::overview>, as used by the C<rent> extension.
968
969 cf::register_script_function "rent::overview" => sub {
970 ...
971 };
972
973=cut
974
813sub register_script_function { 975sub register_script_function {
814 my ($fun, $cb) = @_; 976 my ($fun, $cb) = @_;
815 977
816 no strict 'refs'; 978 no strict 'refs';
817 *{"safe::$fun"} = $safe_hole->wrap ($cb); 979 *{"safe::$fun"} = $safe_hole->wrap ($cb);
818} 980}
981
982=back
983
984=cut
819 985
820############################################################################# 986#############################################################################
821 987
822=head2 EXTENSION DATABASE SUPPORT 988=head2 EXTENSION DATABASE SUPPORT
823 989
858 1024
859Immediately write the database to disk I<if it is dirty>. 1025Immediately write the database to disk I<if it is dirty>.
860 1026
861=cut 1027=cut
862 1028
1029our $DB;
1030
863{ 1031{
864 my $db;
865 my $path = cf::localdir . "/database.pst"; 1032 my $path = cf::localdir . "/database.pst";
866 1033
867 sub db_load() { 1034 sub db_load() {
868 warn "loading database $path\n";#d# remove later 1035 warn "loading database $path\n";#d# remove later
869 $db = stat $path ? Storable::retrieve $path : { }; 1036 $DB = stat $path ? Storable::retrieve $path : { };
870 } 1037 }
871 1038
872 my $pid; 1039 my $pid;
873 1040
874 sub db_save() { 1041 sub db_save() {
875 warn "saving database $path\n";#d# remove later 1042 warn "saving database $path\n";#d# remove later
876 waitpid $pid, 0 if $pid; 1043 waitpid $pid, 0 if $pid;
877 if (0 == ($pid = fork)) { 1044 if (0 == ($pid = fork)) {
878 $db->{_meta}{version} = 1; 1045 $DB->{_meta}{version} = 1;
879 Storable::nstore $db, "$path~"; 1046 Storable::nstore $DB, "$path~";
880 rename "$path~", $path; 1047 rename "$path~", $path;
881 cf::_exit 0 if defined $pid; 1048 cf::_exit 0 if defined $pid;
882 } 1049 }
883 } 1050 }
884 1051
887 sub db_sync() { 1054 sub db_sync() {
888 db_save if $dirty; 1055 db_save if $dirty;
889 undef $dirty; 1056 undef $dirty;
890 } 1057 }
891 1058
892 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, cb => sub { 1059 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
893 db_sync; 1060 db_sync;
894 }); 1061 });
895 1062
896 sub db_dirty() { 1063 sub db_dirty() {
897 $dirty = 1; 1064 $dirty = 1;
898 $idle->start; 1065 $idle->start;
899 } 1066 }
900 1067
901 sub db_get($;$) { 1068 sub db_get($;$) {
902 @_ >= 2 1069 @_ >= 2
903 ? $db->{$_[0]}{$_[1]} 1070 ? $DB->{$_[0]}{$_[1]}
904 : ($db->{$_[0]} ||= { }) 1071 : ($DB->{$_[0]} ||= { })
905 } 1072 }
906 1073
907 sub db_put($$;$) { 1074 sub db_put($$;$) {
908 if (@_ >= 3) { 1075 if (@_ >= 3) {
909 $db->{$_[0]}{$_[1]} = $_[2]; 1076 $DB->{$_[0]}{$_[1]} = $_[2];
910 } else { 1077 } else {
911 $db->{$_[0]} = $_[1]; 1078 $DB->{$_[0]} = $_[1];
912 } 1079 }
913 db_dirty; 1080 db_dirty;
914 } 1081 }
915 1082
916 attach_global 1083 attach_global
922} 1089}
923 1090
924############################################################################# 1091#############################################################################
925# the server's main() 1092# the server's main()
926 1093
1094sub cfg_load {
1095 open my $fh, "<:utf8", cf::confdir . "/config"
1096 or return;
1097
1098 local $/;
1099 *CFG = YAML::Syck::Load <$fh>;
1100}
1101
927sub main { 1102sub main {
1103 cfg_load;
928 db_load; 1104 db_load;
929 load_extensions; 1105 load_extensions;
930 Event::loop; 1106 Event::loop;
931} 1107}
932 1108
938 1114
939 $msg->("reloading..."); 1115 $msg->("reloading...");
940 1116
941 eval { 1117 eval {
942 # cancel all watchers 1118 # cancel all watchers
943 $_->cancel for Event::all_watchers; 1119 for (Event::all_watchers) {
1120 $_->cancel if $_->data & WF_AUTOCANCEL;
1121 }
944 1122
945 # unload all extensions 1123 # unload all extensions
946 for (@exts) { 1124 for (@exts) {
947 $msg->("unloading <$_>"); 1125 $msg->("unloading <$_>");
948 unload_extension $_; 1126 unload_extension $_;
984 1162
985 # reload cf.pm 1163 # reload cf.pm
986 $msg->("reloading cf.pm"); 1164 $msg->("reloading cf.pm");
987 require cf; 1165 require cf;
988 1166
989 # load database again 1167 # load config and database again
1168 cf::cfg_load;
990 cf::db_load; 1169 cf::db_load;
991 1170
992 # load extensions 1171 # load extensions
993 $msg->("load extensions"); 1172 $msg->("load extensions");
994 cf::load_extensions; 1173 cf::load_extensions;
1007 warn $_[0]; 1186 warn $_[0];
1008 print "$_[0]\n"; 1187 print "$_[0]\n";
1009 }; 1188 };
1010} 1189}
1011 1190
1191register "<global>", __PACKAGE__;
1192
1012register_command "perl-reload", 0, sub { 1193register_command "perl-reload" => sub {
1013 my ($who, $arg) = @_; 1194 my ($who, $arg) = @_;
1014 1195
1015 if ($who->flag (FLAG_WIZ)) { 1196 if ($who->flag (FLAG_WIZ)) {
1016 _perl_reload { 1197 _perl_reload {
1017 warn $_[0]; 1198 warn $_[0];
1018 $who->message ($_[0]); 1199 $who->message ($_[0]);
1019 }; 1200 };
1020 } 1201 }
1021}; 1202};
1022 1203
1023register "<global>", __PACKAGE__;
1024
1025unshift @INC, $LIBDIR; 1204unshift @INC, $LIBDIR;
1026 1205
1027$TICK_WATCHER = Event->timer ( 1206$TICK_WATCHER = Event->timer (
1028 prio => 1, 1207 prio => 0,
1029 at => $NEXT_TICK || 1, 1208 at => $NEXT_TICK || 1,
1209 data => WF_AUTOCANCEL,
1030 cb => sub { 1210 cb => sub {
1031 cf::server_tick; # one server iteration 1211 cf::server_tick; # one server iteration
1032 1212
1033 my $NOW = Event::time; 1213 my $NOW = Event::time;
1034 $NEXT_TICK += $TICK; 1214 $NEXT_TICK += $TICK;
1035 1215
1036 # if we are delayed by four ticks, skip them all 1216 # if we are delayed by four ticks or more, skip them all
1037 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1217 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
1038 1218
1039 $TICK_WATCHER->at ($NEXT_TICK); 1219 $TICK_WATCHER->at ($NEXT_TICK);
1040 $TICK_WATCHER->start; 1220 $TICK_WATCHER->start;
1041 }, 1221 },
1042); 1222);
1043 1223
1224IO::AIO::max_poll_time $TICK * 0.2;
1225
1226Event->io (fd => IO::AIO::poll_fileno,
1227 poll => 'r',
1228 prio => 5,
1229 data => WF_AUTOCANCEL,
1230 cb => \&IO::AIO::poll_cb);
1231
10441 12321
1045 1233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines