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.57 by root, Wed Aug 30 11:21:24 2006 UTC vs.
Revision 1.84 by root, Mon Dec 11 02:54:57 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
16_reload_1; 21_init_vars;
17 22
18our %COMMAND = (); 23our %COMMAND = ();
19our @EVENT; 24our @EVENT;
20our %PROP_TYPE;
21our %PROP_IDX;
22our $LIBDIR = maps_directory "perl"; 25our $LIBDIR = maps_directory "perl";
23 26
24our $TICK = MAX_TIME * 1e-6; 27our $TICK = MAX_TIME * 1e-6;
25our $TICK_WATCHER; 28our $TICK_WATCHER;
26our $NEXT_TICK; 29our $NEXT_TICK;
30
31our %CFG;
32
33our $UPTIME; $UPTIME ||= time;
34
35#############################################################################
36
37=head2 GLOBAL VARIABLES
38
39=over 4
40
41=item $cf::UPTIME
42
43The timestamp of the server start (so not actually an uptime).
44
45=item $cf::LIBDIR
46
47The perl library directory, where extensions and cf-specific modules can
48be found. It will be added to C<@INC> automatically.
49
50=item $cf::TICK
51
52The interval between server ticks, in seconds.
53
54=item %cf::CFG
55
56Configuration for the server, loaded from C</etc/crossfire/config>, or
57from wherever your confdir points to.
58
59=back
60
61=cut
27 62
28BEGIN { 63BEGIN {
29 *CORE::GLOBAL::warn = sub { 64 *CORE::GLOBAL::warn = sub {
30 my $msg = join "", @_; 65 my $msg = join "", @_;
31 $msg .= "\n" 66 $msg .= "\n"
34 print STDERR "cfperl: $msg"; 69 print STDERR "cfperl: $msg";
35 LOG llevError, "cfperl: $msg"; 70 LOG llevError, "cfperl: $msg";
36 }; 71 };
37} 72}
38 73
39my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply!
40
41# generate property mutators
42sub prop_gen {
43 my ($prefix, $class) = @_;
44
45 no strict 'refs';
46
47 for my $prop (keys %PROP_TYPE) {
48 $prop =~ /^\Q$prefix\E_(.*$)/ or next;
49 my $sub = lc $1;
50
51 my $type = $PROP_TYPE{$prop};
52 my $idx = $PROP_IDX {$prop};
53
54 *{"$class\::get_$sub"} = *{"$class\::$sub"} = sub {
55 $_[0]->get_property ($type, $idx)
56 };
57
58 *{"$class\::set_$sub"} = sub {
59 $_[0]->set_property ($type, $idx, $_[1]);
60 } unless $ignore_set{$prop};
61 }
62}
63
64# auto-generate most of the API
65
66prop_gen OBJECT_PROP => "cf::object";
67# CFAPI_OBJECT_ANIMATION?
68prop_gen PLAYER_PROP => "cf::object::player";
69
70prop_gen MAP_PROP => "cf::map";
71prop_gen ARCH_PROP => "cf::arch";
72
73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 74@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
74 75
75# we bless all objects into (empty) derived classes to force a method lookup 76# we bless all objects into (empty) derived classes to force a method lookup
76# within the Safe compartment. 77# within the Safe compartment.
77for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) { 78for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) {
87my @exts; 88my @exts;
88my @hook; 89my @hook;
89my %command; 90my %command;
90my %extcmd; 91my %extcmd;
91 92
92############################################################################# 93=head2 UTILITY FUNCTIONS
93# utility functions 94
95=over 4
96
97=cut
94 98
95use JSON::Syck (); # TODO# replace by JSON::PC once working 99use JSON::Syck (); # TODO# replace by JSON::PC once working
100
101=item $ref = cf::from_json $json
102
103Converts a JSON string into the corresponding perl data structure.
104
105=cut
96 106
97sub from_json($) { 107sub from_json($) {
98 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs 108 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
99 JSON::Syck::Load $_[0] 109 JSON::Syck::Load $_[0]
100} 110}
101 111
112=item $json = cf::to_json $ref
113
114Converts a perl data structure into its JSON representation.
115
116=cut
117
102sub to_json($) { 118sub to_json($) {
103 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 119 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
104 JSON::Syck::Dump $_[0] 120 JSON::Syck::Dump $_[0]
105} 121}
106 122
123=back
124
125=cut
126
107############################################################################# 127#############################################################################
108# "new" plug-in system
109 128
110=head3 EVENTS AND OBJECT ATTACHMENTS 129=head2 EVENTS AND OBJECT ATTACHMENTS
111 130
112=over 4 131=over 4
113 132
114=item $object->attach ($attachment, key => $value...) 133=item $object->attach ($attachment, key => $value...)
115 134
389 for (@$callbacks) { 408 for (@$callbacks) {
390 eval { &{$_->[1]} }; 409 eval { &{$_->[1]} };
391 410
392 if ($@) { 411 if ($@) {
393 warn "$@"; 412 warn "$@";
394 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n"; 413 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
395 override; 414 override;
396 } 415 }
397 416
398 return 1 if $override; 417 return 1 if $override;
399 } 418 }
415removed in future versions), and there is no public API to access override 434removed in future versions), and there is no public API to access override
416results (if you must, access C<@cf::invoke_results> directly). 435results (if you must, access C<@cf::invoke_results> directly).
417 436
418=back 437=back
419 438
420=head2 methods valid for all pointers 439=cut
440
441#############################################################################
442
443=head2 METHODS VALID FOR ALL CORE OBJECTS
421 444
422=over 4 445=over 4
423 446
424=item $object->valid 447=item $object->valid, $player->valid, $map->valid
425
426=item $player->valid
427
428=item $map->valid
429 448
430Just because you have a perl object does not mean that the corresponding 449Just because you have a perl object does not mean that the corresponding
431C-level object still exists. If you try to access an object that has no 450C-level object still exists. If you try to access an object that has no
432valid C counterpart anymore you get an exception at runtime. This method 451valid C counterpart anymore you get an exception at runtime. This method
433can be used to test for existence of the C object part without causing an 452can be used to test for existence of the C object part without causing an
476 } 495 }
477 } 496 }
478} 497}
479 498
480sub object_freezer_save { 499sub object_freezer_save {
481 my ($filename, $objs) = @_; 500 my ($filename, $rdata, $objs) = @_;
482 501
483 if (@$objs) { 502 if (length $$rdata) {
503 warn sprintf "saving %s (%d,%d)\n",
504 $filename, length $$rdata, scalar @$objs;
505
484 open my $fh, ">:raw", "$filename.pst~"; 506 if (open my $fh, ">:raw", "$filename~") {
507 chmod SAVE_MODE, $fh;
508 syswrite $fh, $$rdata;
509 close $fh;
510
511 if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
512 chmod SAVE_MODE, $fh;
485 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs }; 513 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
486 close $fh; 514 close $fh;
487 unlink "$filename.cfperl";
488 chmod SAVE_MODE, "$filename.pst~";
489 rename "$filename.pst~", "$filename.pst"; 515 rename "$filename.pst~", "$filename.pst";
516 } else {
517 unlink "$filename.pst";
518 }
519
520 rename "$filename~", $filename;
521 } else {
522 warn "FATAL: $filename~: $!\n";
523 }
490 } else { 524 } else {
525 unlink $filename;
491 unlink "$filename.pst"; 526 unlink "$filename.pst";
492 } 527 }
528}
493 529
494 chmod SAVE_MODE, "$filename~"; 530sub object_freezer_as_string {
495 rename "$filename~", $filename; 531 my ($rdata, $objs) = @_;
532
533 use Data::Dumper;
534
535 $$rdata . Dumper $objs
496} 536}
497 537
498sub object_thawer_load { 538sub object_thawer_load {
499 my ($filename) = @_; 539 my ($filename) = @_;
500 540
541 local $/;
542
543 my $av;
544
545 #TODO: use sysread etc.
546 if (open my $data, "<:raw:perlio", $filename) {
547 $data = <$data>;
501 open my $fh, "<:raw:perlio", "$filename.pst" 548 if (open my $pst, "<:raw:perlio", "$filename.pst") {
502 or return; 549 $av = eval { (Storable::thaw <$pst>)->{objs} };
550 }
551 return ($data, $av);
552 }
503 553
504 eval { local $/; (Storable::thaw <$fh>)->{objs} } 554 ()
505} 555}
506 556
507attach_to_objects 557attach_to_objects
508 prio => -1000000, 558 prio => -1000000,
509 on_clone => sub { 559 on_clone => sub {
594 . "#line 1 \"$path\"\n{\n" 644 . "#line 1 \"$path\"\n{\n"
595 . (do { local $/; <$fh> }) 645 . (do { local $/; <$fh> })
596 . "\n};\n1"; 646 . "\n};\n1";
597 647
598 eval $source 648 eval $source
599 or die "$path: $@"; 649 or die $@ ? "$path: $@\n"
650 : "extension disabled.\n";
600 651
601 push @exts, $pkg; 652 push @exts, $pkg;
602 $ext_pkg{$base} = $pkg; 653 $ext_pkg{$base} = $pkg;
603 654
604# no strict 'refs'; 655# no strict 'refs';
655 load_extension $ext; 706 load_extension $ext;
656 1 707 1
657 } or warn "$ext not loaded: $@"; 708 } or warn "$ext not loaded: $@";
658 } 709 }
659} 710}
660
661sub _perl_reload(&) {
662 my ($msg) = @_;
663
664 $msg->("reloading...");
665
666 eval {
667 # 1. cancel all watchers
668 $_->cancel for Event::all_watchers;
669
670 # 2. unload all extensions
671 for (@exts) {
672 $msg->("unloading <$_>");
673 unload_extension $_;
674 }
675
676 # 3. unload all modules loaded from $LIBDIR
677 while (my ($k, $v) = each %INC) {
678 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
679
680 $msg->("removing <$k>");
681 delete $INC{$k};
682
683 $k =~ s/\.pm$//;
684 $k =~ s/\//::/g;
685
686 if (my $cb = $k->can ("unload_module")) {
687 $cb->();
688 }
689
690 Symbol::delete_package $k;
691 }
692
693 # 4. get rid of safe::, as good as possible
694 Symbol::delete_package "safe::$_"
695 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
696
697 # 5. remove register_script_function callbacks
698 # TODO
699
700 # 6. unload cf.pm "a bit"
701 delete $INC{"cf.pm"};
702
703 # don't, removes xs symbols, too,
704 # and global variables created in xs
705 #Symbol::delete_package __PACKAGE__;
706
707 # 7. reload cf.pm
708 $msg->("reloading cf.pm");
709 require cf;
710 };
711 $msg->($@) if $@;
712
713 $msg->("reloaded");
714};
715
716sub perl_reload() {
717 _perl_reload {
718 warn $_[0];
719 print "$_[0]\n";
720 };
721}
722
723register_command "perl-reload", 0, sub {
724 my ($who, $arg) = @_;
725
726 if ($who->flag (FLAG_WIZ)) {
727 _perl_reload {
728 warn $_[0];
729 $who->message ($_[0]);
730 };
731 }
732};
733 711
734############################################################################# 712#############################################################################
735# extcmd framework, basically convert ext <msg> 713# extcmd framework, basically convert ext <msg>
736# into pkg::->on_extcmd_arg1 (...) while shortcutting a few 714# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
737 715
765 defined $path or return; 743 defined $path or return;
766 744
767 unlink "$path.pst"; 745 unlink "$path.pst";
768}; 746};
769 747
770# old style persistent data, TODO: remove #d#
771*cf::mapsupport::on_swapin = sub {
772 my ($map) = @_;
773
774 my $path = $map->tmpname;
775 $path = $map->path unless defined $path;
776
777 open my $fh, "<:raw", "$path.cfperl"
778 or return; # no perl data
779
780 my $data = Storable::thaw do { local $/; <$fh> };
781
782 $data->{version} <= 1
783 or return; # too new
784
785 $map->_set_obs ($data->{obs});
786 $map->invoke (EVENT_MAP_UPGRADE);
787};
788
789attach_to_maps prio => -10000, package => cf::mapsupport::; 748attach_to_maps prio => -10000, package => cf::mapsupport::;
790 749
791############################################################################# 750#############################################################################
792# load/save perl data associated with player->ob objects 751# load/save perl data associated with player->ob objects
793 752
794sub all_objects(@) { 753sub all_objects(@) {
795 @_, map all_objects ($_->inv), @_ 754 @_, map all_objects ($_->inv), @_
796} 755}
797 756
757# TODO: compatibility cruft, remove when no longer needed
798attach_to_players 758attach_to_players
799 on_load => sub { 759 on_load => sub {
800 my ($pl, $path) = @_; 760 my ($pl, $path) = @_;
801 761
802 for my $o (all_objects $pl->ob) { 762 for my $o (all_objects $pl->ob) {
808 } 768 }
809 }, 769 },
810; 770;
811 771
812############################################################################# 772#############################################################################
813# core extensions - in perl 773
774=head2 CORE EXTENSIONS
775
776Functions and methods that extend core crossfire objects.
777
778=over 4
814 779
815=item cf::player::exists $login 780=item cf::player::exists $login
816 781
817Returns true when the given account exists. 782Returns true when the given account exists.
818 783
821sub cf::player::exists($) { 786sub cf::player::exists($) {
822 cf::player::find $_[0] 787 cf::player::find $_[0]
823 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 788 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
824} 789}
825 790
826=item $player->reply ($npc, $msg[, $flags]) 791=item $player_object->reply ($npc, $msg[, $flags])
827 792
828Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 793Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
829can be C<undef>. Does the right thing when the player is currently in a 794can be C<undef>. Does the right thing when the player is currently in a
830dialogue with the given NPC character. 795dialogue with the given NPC character.
831 796
858 $msg{msgid} = $id; 823 $msg{msgid} = $id;
859 824
860 $self->send ("ext " . to_json \%msg); 825 $self->send ("ext " . to_json \%msg);
861} 826}
862 827
828=item $player_object->may ("access")
829
830Returns wether the given player is authorized to access resource "access"
831(e.g. "command_wizcast").
832
833=cut
834
835sub cf::object::player::may {
836 my ($self, $access) = @_;
837
838 $self->flag (cf::FLAG_WIZ) ||
839 (ref $cf::CFG{"may_$access"}
840 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
841 : $cf::CFG{"may_$access"})
842}
843
844=cut
845
863############################################################################# 846#############################################################################
864# map scripting support 847
848=head2 SAFE SCRIPTING
849
850Functions that provide a safe environment to compile and execute
851snippets of perl code without them endangering the safety of the server
852itself. Looping constructs, I/O operators and other built-in functionality
853is not available in the safe scripting environment, and the number of
854functions and methods that can be called is greatly reduced.
855
856=cut
865 857
866our $safe = new Safe "safe"; 858our $safe = new Safe "safe";
867our $safe_hole = new Safe::Hole; 859our $safe_hole = new Safe::Hole;
868 860
869$SIG{FPE} = 'IGNORE'; 861$SIG{FPE} = 'IGNORE';
870 862
871$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 863$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
872 864
873# here we export the classes and methods available to script code 865# here we export the classes and methods available to script code
866
867=pod
868
869The following fucntions and emthods are available within a safe environment:
870
871 cf::object contr pay_amount pay_player
872 cf::object::player player
873 cf::player peaceful
874
875=cut
874 876
875for ( 877for (
876 ["cf::object" => qw(contr pay_amount pay_player)], 878 ["cf::object" => qw(contr pay_amount pay_player)],
877 ["cf::object::player" => qw(player)], 879 ["cf::object::player" => qw(player)],
878 ["cf::player" => qw(peaceful)], 880 ["cf::player" => qw(peaceful)],
881 my ($pkg, @funs) = @$_; 883 my ($pkg, @funs) = @$_;
882 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 884 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
883 for @funs; 885 for @funs;
884} 886}
885 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
899
886sub safe_eval($;@) { 900sub safe_eval($;@) {
887 my ($code, %vars) = @_; 901 my ($code, %vars) = @_;
888 902
889 my $qcode = $code; 903 my $qcode = $code;
890 $qcode =~ s/"/‟/g; # not allowed in #line filenames 904 $qcode =~ s/"/‟/g; # not allowed in #line filenames
912 } 926 }
913 927
914 wantarray ? @res : $res[0] 928 wantarray ? @res : $res[0]
915} 929}
916 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
917sub register_script_function { 946sub register_script_function {
918 my ($fun, $cb) = @_; 947 my ($fun, $cb) = @_;
919 948
920 no strict 'refs'; 949 no strict 'refs';
921 *{"safe::$fun"} = $safe_hole->wrap ($cb); 950 *{"safe::$fun"} = $safe_hole->wrap ($cb);
922} 951}
923 952
953=back
954
955=cut
956
957#############################################################################
958
959=head2 EXTENSION DATABASE SUPPORT
960
961Crossfire maintains a very simple database for extension use. It can
962currently store anything that can be serialised using Storable, which
963excludes objects.
964
965The parameter C<$family> should best start with the name of the extension
966using it, it should be unique.
967
968=over 4
969
970=item $hashref = cf::db_get $family
971
972Return a hashref for use by the extension C<$family>, which can be
973modified. After modifications, you have to call C<cf::db_dirty> or
974C<cf::db_sync>.
975
976=item $value = cf::db_get $family => $key
977
978Returns a single value from the database
979
980=item cf::db_put $family => $hashref
981
982Stores the given family hashref into the database. Updates are delayed, if
983you want the data to be synced to disk immediately, use C<cf::db_sync>.
984
985=item cf::db_put $family => $key => $value
986
987Stores the given C<$value> in the family hash. Updates are delayed, if you
988want the data to be synced to disk immediately, use C<cf::db_sync>.
989
990=item cf::db_dirty
991
992Marks the database as dirty, to be updated at a later time.
993
994=item cf::db_sync
995
996Immediately write the database to disk I<if it is dirty>.
997
998=cut
999
1000our $DB;
1001
1002{
1003 my $path = cf::localdir . "/database.pst";
1004
1005 sub db_load() {
1006 warn "loading database $path\n";#d# remove later
1007 $DB = stat $path ? Storable::retrieve $path : { };
1008 }
1009
1010 my $pid;
1011
1012 sub db_save() {
1013 warn "saving database $path\n";#d# remove later
1014 waitpid $pid, 0 if $pid;
1015 if (0 == ($pid = fork)) {
1016 $DB->{_meta}{version} = 1;
1017 Storable::nstore $DB, "$path~";
1018 rename "$path~", $path;
1019 cf::_exit 0 if defined $pid;
1020 }
1021 }
1022
1023 my $dirty;
1024
1025 sub db_sync() {
1026 db_save if $dirty;
1027 undef $dirty;
1028 }
1029
1030 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, cb => sub {
1031 db_sync;
1032 });
1033
1034 sub db_dirty() {
1035 $dirty = 1;
1036 $idle->start;
1037 }
1038
1039 sub db_get($;$) {
1040 @_ >= 2
1041 ? $DB->{$_[0]}{$_[1]}
1042 : ($DB->{$_[0]} ||= { })
1043 }
1044
1045 sub db_put($$;$) {
1046 if (@_ >= 3) {
1047 $DB->{$_[0]}{$_[1]} = $_[2];
1048 } else {
1049 $DB->{$_[0]} = $_[1];
1050 }
1051 db_dirty;
1052 }
1053
1054 attach_global
1055 prio => 10000,
1056 on_cleanup => sub {
1057 db_sync;
1058 },
1059 ;
1060}
1061
924############################################################################# 1062#############################################################################
925# the server's main() 1063# the server's main()
926 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
927sub main { 1073sub main {
1074 cfg_load;
1075 db_load;
1076 load_extensions;
928 Event::loop; 1077 Event::loop;
929} 1078}
930 1079
931############################################################################# 1080#############################################################################
932# initialisation 1081# initialisation
933 1082
1083sub _perl_reload(&) {
1084 my ($msg) = @_;
1085
1086 $msg->("reloading...");
1087
1088 eval {
1089 # cancel all watchers
1090 $_->cancel for Event::all_watchers;
1091
1092 # unload all extensions
1093 for (@exts) {
1094 $msg->("unloading <$_>");
1095 unload_extension $_;
1096 }
1097
1098 # unload all modules loaded from $LIBDIR
1099 while (my ($k, $v) = each %INC) {
1100 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1101
1102 $msg->("removing <$k>");
1103 delete $INC{$k};
1104
1105 $k =~ s/\.pm$//;
1106 $k =~ s/\//::/g;
1107
1108 if (my $cb = $k->can ("unload_module")) {
1109 $cb->();
1110 }
1111
1112 Symbol::delete_package $k;
1113 }
1114
1115 # sync database to disk
1116 cf::db_sync;
1117
1118 # get rid of safe::, as good as possible
1119 Symbol::delete_package "safe::$_"
1120 for qw(cf::object cf::object::player cf::player cf::map cf::party cf::region);
1121
1122 # remove register_script_function callbacks
1123 # TODO
1124
1125 # unload cf.pm "a bit"
1126 delete $INC{"cf.pm"};
1127
1128 # don't, removes xs symbols, too,
1129 # and global variables created in xs
1130 #Symbol::delete_package __PACKAGE__;
1131
1132 # reload cf.pm
1133 $msg->("reloading cf.pm");
1134 require cf;
1135
1136 # load config and database again
1137 cf::cfg_load;
1138 cf::db_load;
1139
1140 # load extensions
1141 $msg->("load extensions");
1142 cf::load_extensions;
1143
1144 # reattach attachments to objects
1145 $msg->("reattach");
1146 _global_reattach;
1147 };
1148 $msg->($@) if $@;
1149
1150 $msg->("reloaded");
1151};
1152
1153sub perl_reload() {
1154 _perl_reload {
1155 warn $_[0];
1156 print "$_[0]\n";
1157 };
1158}
1159
1160register_command "perl-reload", 0, sub {
1161 my ($who, $arg) = @_;
1162
1163 if ($who->flag (FLAG_WIZ)) {
1164 _perl_reload {
1165 warn $_[0];
1166 $who->message ($_[0]);
1167 };
1168 }
1169};
1170
934register "<global>", __PACKAGE__; 1171register "<global>", __PACKAGE__;
935 1172
936unshift @INC, $LIBDIR; 1173unshift @INC, $LIBDIR;
937 1174
938load_extensions;
939
940$TICK_WATCHER = Event->timer ( 1175$TICK_WATCHER = Event->timer (
941 prio => 1, 1176 prio => 1,
1177 async => 1,
942 at => $NEXT_TICK || 1, 1178 at => $NEXT_TICK || 1,
943 cb => sub { 1179 cb => sub {
944 cf::server_tick; # one server iteration 1180 cf::server_tick; # one server iteration
945 1181
946 my $NOW = Event::time; 1182 my $NOW = Event::time;
947 $NEXT_TICK += $TICK; 1183 $NEXT_TICK += $TICK;
948 1184
949 # if we are delayed by four ticks, skip them all 1185 # if we are delayed by four ticks or more, skip them all
950 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1186 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
951 1187
952 $TICK_WATCHER->at ($NEXT_TICK); 1188 $TICK_WATCHER->at ($NEXT_TICK);
953 $TICK_WATCHER->start; 1189 $TICK_WATCHER->start;
954 }, 1190 },
955); 1191);
956 1192
957_reload_2; 1193IO::AIO::max_poll_time $TICK * 0.2;
1194
1195Event->io (fd => IO::AIO::poll_fileno,
1196 poll => 'r',
1197 prio => 5,
1198 cb => \&IO::AIO::poll_cb);
958 1199
9591 12001
960 1201

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines