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.145 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.204 by root, Fri Feb 2 19:59:22 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.5 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.32 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 35
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
43our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
44our $NEXT_TICK; 51our $NEXT_TICK;
45our $NOW; 52our $NOW;
53our $USE_FSYNC; # use fsync to write maps - default off
46 54
47our %CFG; 55our %CFG;
48 56
49our $UPTIME; $UPTIME ||= time; 57our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 58our $RUNTIME;
51 59
52our %PLAYER; # all users 60our %PLAYER; # all users
53our %MAP; # all maps 61our %MAP; # all maps
54our $LINK_MAP; # the special {link} map 62our $LINK_MAP; # the special {link} map, which is always available
55our $RANDOM_MAPS = cf::localdir . "/random"; 63our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; # coroutines bound to extensions 64
65our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
66our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
67
68# used to convert map paths into valid unix filenames by replacing / by ∕
69our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57 70
58binmode STDOUT; 71binmode STDOUT;
59binmode STDERR; 72binmode STDERR;
60 73
61# read virtual server time, if available 74# read virtual server time, if available
69mkdir cf::localdir . "/" . cf::playerdir; 82mkdir cf::localdir . "/" . cf::playerdir;
70mkdir cf::localdir . "/" . cf::tmpdir; 83mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir; 84mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 85mkdir $RANDOM_MAPS;
73 86
74# a special map that is always available
75our $LINK_MAP;
76our $EMERGENCY_POSITION; 87our $EMERGENCY_POSITION;
88
89sub cf::map::normalise;
77 90
78############################################################################# 91#############################################################################
79 92
80=head2 GLOBAL VARIABLES 93=head2 GLOBAL VARIABLES
81 94
105 118
106=item %cf::CFG 119=item %cf::CFG
107 120
108Configuration for the server, loaded from C</etc/crossfire/config>, or 121Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 122from wherever your confdir points to.
123
124=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
125
126These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
127or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
128processing has been done. Call C<< ->wait >> on them to maximise the
129window of cpu time available, or simply to synchronise to the server tick.
110 130
111=back 131=back
112 132
113=cut 133=cut
114 134
118 utf8::encode $msg; 138 utf8::encode $msg;
119 139
120 $msg .= "\n" 140 $msg .= "\n"
121 unless $msg =~ /\n$/; 141 unless $msg =~ /\n$/;
122 142
123 LOG llevError, "cfperl: $msg"; 143 LOG llevError, $msg;
124 }; 144 };
125} 145}
126 146
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 147@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 148@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146 166
147$Event::DIED = sub { 167$Event::DIED = sub {
148 warn "error in event callback: @_"; 168 warn "error in event callback: @_";
149}; 169};
150 170
151my %ext_pkg;
152my @exts;
153my @hook;
154
155=head2 UTILITY FUNCTIONS 171=head2 UTILITY FUNCTIONS
156 172
157=over 4 173=over 4
158 174
175=item dumpval $ref
176
159=cut 177=cut
178
179sub dumpval {
180 eval {
181 local $SIG{__DIE__};
182 my $d;
183 if (1) {
184 $d = new Data::Dumper([$_[0]], ["*var"]);
185 $d->Terse(1);
186 $d->Indent(2);
187 $d->Quotekeys(0);
188 $d->Useqq(1);
189 #$d->Bless(...);
190 $d->Seen($_[1]) if @_ > 1;
191 $d = $d->Dump();
192 }
193 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
194 $d
195 } || "[unable to dump $_[0]: '$@']";
196}
160 197
161use JSON::Syck (); # TODO# replace by JSON::PC once working 198use JSON::Syck (); # TODO# replace by JSON::PC once working
162 199
163=item $ref = cf::from_json $json 200=item $ref = cf::from_json $json
164 201
225} 262}
226 263
227sub freeze_mainloop { 264sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active; 265 return unless $TICK_WATCHER->is_active;
229 266
230 my $guard = Coro::guard { $TICK_WATCHER->start }; 267 my $guard = Coro::guard {
268 $TICK_WATCHER->start;
269 $WRITE_RUNTIME_WATCHER->start;
270 };
271 $WRITE_RUNTIME_WATCHER->stop;
231 $TICK_WATCHER->stop; 272 $TICK_WATCHER->stop;
232 $guard 273 $guard
233} 274}
234 275
235=item cf::async { BLOCK } 276=item cf::async { BLOCK }
287 } 328 }
288} 329}
289 330
290=item $coro = cf::async_ext { BLOCK } 331=item $coro = cf::async_ext { BLOCK }
291 332
292Like async, but this coro is automcatially being canceled when the 333Like async, but this coro is automatically being canceled when the
293extension calling this is being unloaded. 334extension calling this is being unloaded.
294 335
295=cut 336=cut
296 337
297sub async_ext(&) { 338sub async_ext(&) {
311 my $runtime = cf::localdir . "/runtime"; 352 my $runtime = cf::localdir . "/runtime";
312 353
313 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
314 or return; 355 or return;
315 356
357 my $value = $cf::RUNTIME + 90 + 10;
316 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 358 # 10 is the runtime save interval, for a monotonic clock
359 # 60 allows for the watchdog to kill the server.
360
317 (aio_write $fh, 0, (length $value), $value, 0) <= 0 361 (aio_write $fh, 0, (length $value), $value, 0) <= 0
318 and return; 362 and return;
319 363
364 # always fsync - this file is important
320 aio_fsync $fh 365 aio_fsync $fh
321 and return; 366 and return;
322 367
323 close $fh 368 close $fh
324 or return; 369 or return;
330} 375}
331 376
332=back 377=back
333 378
334=cut 379=cut
335
336#############################################################################
337
338package cf::path;
339
340sub new {
341 my ($class, $path, $base) = @_;
342
343 $path = $path->as_string if ref $path;
344
345 my $self = bless { }, $class;
346
347 # {... are special paths that are not touched
348 # ?xxx/... are special absolute paths
349 # ?random/... random maps
350 # /! non-realised random map exit
351 # /... normal maps
352 # ~/... per-player maps without a specific player (DO NOT USE)
353 # ~user/... per-player map of a specific user
354
355 if ($path =~ /^{/) {
356 # fine as it is
357 } elsif ($path =~ s{^\?random/}{}) {
358 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
359 $self->{random} = cf::from_json $data;
360 } else {
361 if ($path =~ s{^~([^/]+)?}{}) {
362 $self->{user_rel} = 1;
363
364 if (defined $1) {
365 $self->{user} = $1;
366 } elsif ($base =~ m{^~([^/]+)/}) {
367 $self->{user} = $1;
368 } else {
369 warn "cannot resolve user-relative path without user <$path,$base>\n";
370 }
371 } elsif ($path =~ /^\//) {
372 # already absolute
373 } else {
374 $base =~ s{[^/]+/?$}{};
375 return $class->new ("$base/$path");
376 }
377
378 for ($path) {
379 redo if s{/\.?/}{/};
380 redo if s{/[^/]+/\.\./}{/};
381 }
382 }
383
384 $self->{path} = $path;
385
386 $self
387}
388
389# the name / primary key / in-game path
390sub as_string {
391 my ($self) = @_;
392
393 $self->{user_rel} ? "~$self->{user}$self->{path}"
394 : $self->{random} ? "?random/$self->{path}"
395 : $self->{path}
396}
397
398# the displayed name, this is a one way mapping
399sub visible_name {
400 my ($self) = @_;
401
402# if (my $rmp = $self->{random}) {
403# # todo: be more intelligent about this
404# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
405# } else {
406 $self->as_string
407# }
408}
409
410# escape the /'s in the path
411sub _escaped_path {
412 # ∕ is U+2215
413 (my $path = $_[0]{path}) =~ s/\//∕/g;
414 $path
415}
416
417# the original (read-only) location
418sub load_path {
419 my ($self) = @_;
420
421 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
422}
423
424# the temporary/swap location
425sub save_path {
426 my ($self) = @_;
427
428 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
429 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
430 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
431}
432
433# the unique path, might be eq to save_path
434sub uniq_path {
435 my ($self) = @_;
436
437 $self->{user_rel} || $self->{random}
438 ? undef
439 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
440}
441
442# return random map parameters, or undef
443sub random_map_params {
444 my ($self) = @_;
445
446 $self->{random}
447}
448
449# this is somewhat ugly, but style maps do need special treatment
450sub is_style_map {
451 $_[0]{path} =~ m{^/styles/}
452}
453
454package cf;
455 380
456############################################################################# 381#############################################################################
457 382
458=head2 ATTACHABLE OBJECTS 383=head2 ATTACHABLE OBJECTS
459 384
585our @CB_TYPE = (); # registry for type (cf-object class) based events 510our @CB_TYPE = (); # registry for type (cf-object class) based events
586our @CB_MAP = (); 511our @CB_MAP = ();
587 512
588my %attachment; 513my %attachment;
589 514
515sub cf::attachable::thawer_merge {
516 # simply override everything except _meta
517 local $_[0]{_meta};
518 %{$_[0]} = %{$_[1]};
519}
520
590sub _attach_cb($$$$) { 521sub _attach_cb($$$$) {
591 my ($registry, $event, $prio, $cb) = @_; 522 my ($registry, $event, $prio, $cb) = @_;
592 523
593 use sort 'stable'; 524 use sort 'stable';
594 525
765# object support 696# object support
766 697
767sub reattach { 698sub reattach {
768 # basically do the same as instantiate, without calling instantiate 699 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 700 my ($obj) = @_;
701
702 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
770 703
771 my $registry = $obj->registry; 704 my $registry = $obj->registry;
772 705
773 @$registry = (); 706 @$registry = ();
774 707
821 $filename, length $$rdata, scalar @$objs; 754 $filename, length $$rdata, scalar @$objs;
822 755
823 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 756 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
824 chmod SAVE_MODE, $fh; 757 chmod SAVE_MODE, $fh;
825 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 758 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
826 aio_fsync $fh; 759 aio_fsync $fh if $cf::USE_FSYNC;
827 close $fh; 760 close $fh;
828 761
829 if (@$objs) { 762 if (@$objs) {
830 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
831 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
832 my $data = Storable::nfreeze { version => 1, objs => $objs }; 765 my $data = Storable::nfreeze { version => 1, objs => $objs };
833 aio_write $fh, 0, (length $data), $data, 0; 766 aio_write $fh, 0, (length $data), $data, 0;
834 aio_fsync $fh; 767 aio_fsync $fh if $cf::USE_FSYNC;
835 close $fh; 768 close $fh;
836 aio_rename "$filename.pst~", "$filename.pst"; 769 aio_rename "$filename.pst~", "$filename.pst";
837 } 770 }
838 } else { 771 } else {
839 aio_unlink "$filename.pst"; 772 aio_unlink "$filename.pst";
845 } 778 }
846 } else { 779 } else {
847 aio_unlink $filename; 780 aio_unlink $filename;
848 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
849 } 782 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
850 } 789 }
851} 790}
852 791
853sub object_freezer_as_string { 792sub object_freezer_as_string {
854 my ($rdata, $objs) = @_; 793 my ($rdata, $objs) = @_;
860 799
861sub object_thawer_load { 800sub object_thawer_load {
862 my ($filename) = @_; 801 my ($filename) = @_;
863 802
864 my ($data, $av); 803 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
865 807
866 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
867 or return; 809 or return;
868 810
869 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
906=cut 848=cut
907 849
908sub register_extcmd { 850sub register_extcmd {
909 my ($name, $cb) = @_; 851 my ($name, $cb) = @_;
910 852
911 my $caller = caller;
912 #warn "registering extcmd '$name' to '$caller'";
913
914 $EXTCMD{$name} = [$cb, $caller]; 853 $EXTCMD{$name} = $cb;
915} 854}
916 855
917cf::player->attach ( 856cf::player->attach (
918 on_command => sub { 857 on_command => sub {
919 my ($pl, $name, $params) = @_; 858 my ($pl, $name, $params) = @_;
932 871
933 my $msg = eval { from_json $buf }; 872 my $msg = eval { from_json $buf };
934 873
935 if (ref $msg) { 874 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 875 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->[0]->($pl, $msg)) { 876 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 877 $pl->ext_reply ($msg->{msgid}, %reply);
939 } 878 }
940 } 879 }
941 } else { 880 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 881 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
944 883
945 cf::override; 884 cf::override;
946 }, 885 },
947); 886);
948 887
949sub register {
950 my ($base, $pkg) = @_;
951
952 #TODO
953}
954
955sub load_extension { 888sub load_extension {
956 my ($path) = @_; 889 my ($path) = @_;
957 890
958 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 891 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
959 my $base = $1; 892 my $base = $1;
960 my $pkg = $1; 893 my $pkg = $1;
961 $pkg =~ s/[^[:word:]]/_/g; 894 $pkg =~ s/[^[:word:]]/_/g;
962 $pkg = "ext::$pkg"; 895 $pkg = "ext::$pkg";
963 896
964 warn "loading '$path' into '$pkg'\n"; 897 warn "... loading '$path' into '$pkg'\n";
965 898
966 open my $fh, "<:utf8", $path 899 open my $fh, "<:utf8", $path
967 or die "$path: $!"; 900 or die "$path: $!";
968 901
969 my $source = 902 my $source =
970 "package $pkg; use strict; use utf8;\n" 903 "package $pkg; use strict; use utf8;\n"
971 . "#line 1 \"$path\"\n{\n" 904 . "#line 1 \"$path\"\n{\n"
972 . (do { local $/; <$fh> }) 905 . (do { local $/; <$fh> })
973 . "\n};\n1"; 906 . "\n};\n1";
974 907
975 eval $source 908 unless (eval $source) {
976 or die $@ ? "$path: $@\n" 909 my $msg = $@ ? "$path: $@\n"
977 : "extension disabled.\n"; 910 : "extension disabled.\n";
978 911 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
979 push @exts, $pkg; 912 warn $@;
980 $ext_pkg{$base} = $pkg; 913 warn "mandatory extension failed to load, exiting.\n";
981 914 exit 1;
982# no strict 'refs'; 915 }
983# @{"$pkg\::ISA"} = ext::; 916 die $@;
984
985 register $base, $pkg;
986}
987
988sub unload_extension {
989 my ($pkg) = @_;
990
991 warn "removing extension $pkg\n";
992
993 # remove hooks
994 #TODO
995# for my $idx (0 .. $#PLUGIN_EVENT) {
996# delete $hook[$idx]{$pkg};
997# } 917 }
998 918
999 # remove commands 919 push @EXTS, $pkg;
1000 for my $name (keys %COMMAND) {
1001 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1002
1003 if (@cb) {
1004 $COMMAND{$name} = \@cb;
1005 } else {
1006 delete $COMMAND{$name};
1007 }
1008 }
1009
1010 # remove extcmds
1011 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1012 delete $EXTCMD{$name};
1013 }
1014
1015 if (my $cb = $pkg->can ("unload")) {
1016 eval {
1017 $cb->($pkg);
1018 1
1019 } or warn "$pkg unloaded, but with errors: $@";
1020 }
1021
1022 Symbol::delete_package $pkg;
1023} 920}
1024 921
1025sub load_extensions { 922sub load_extensions {
1026 for my $ext (<$LIBDIR/*.ext>) { 923 for my $ext (<$LIBDIR/*.ext>) {
1027 next unless -r $ext; 924 next unless -r $ext;
1031 } or warn "$ext not loaded: $@"; 928 } or warn "$ext not loaded: $@";
1032 } 929 }
1033} 930}
1034 931
1035############################################################################# 932#############################################################################
1036# load/save/clean perl data associated with a map
1037
1038*cf::mapsupport::on_clean = sub {
1039 my ($map) = @_;
1040
1041 my $path = $map->tmpname;
1042 defined $path or return;
1043
1044 unlink "$path.pst";
1045};
1046
1047cf::map->attach (prio => -10000, package => cf::mapsupport::);
1048
1049#############################################################################
1050# load/save perl data associated with player->ob objects
1051
1052sub all_objects(@) {
1053 @_, map all_objects ($_->inv), @_
1054}
1055
1056# TODO: compatibility cruft, remove when no longer needed
1057cf::player->attach (
1058 on_load => sub {
1059 my ($pl, $path) = @_;
1060
1061 for my $o (all_objects $pl->ob) {
1062 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1063 $o->set_ob_key_value ("_perl_data");
1064
1065 %$o = %{ Storable::thaw pack "H*", $value };
1066 }
1067 }
1068 },
1069);
1070
1071#############################################################################
1072 933
1073=head2 CORE EXTENSIONS 934=head2 CORE EXTENSIONS
1074 935
1075Functions and methods that extend core crossfire objects. 936Functions and methods that extend core crossfire objects.
1076 937
1077=cut 938=cut
1078 939
1079package cf::player; 940package cf::player;
941
942use Coro::AIO;
1080 943
1081=head3 cf::player 944=head3 cf::player
1082 945
1083=over 4 946=over 4
1084 947
1110 973
1111sub exists($) { 974sub exists($) {
1112 my ($login) = @_; 975 my ($login) = @_;
1113 976
1114 $cf::PLAYER{$login} 977 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login } 978 or cf::sync_job { !aio_stat path $login }
1116} 979}
1117 980
1118sub find($) { 981sub find($) {
1119 return $cf::PLAYER{$_[0]} || do { 982 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0]; 983 my $login = $_[0];
1121 984
1122 my $guard = cf::lock_acquire "user_find:$login"; 985 my $guard = cf::lock_acquire "user_find:$login";
1123 986
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return); 987 $cf::PLAYER{$_[0]} || do {
988 my $pl = load_pl path $login
989 or return;
990 $cf::PLAYER{$login} = $pl
991 }
1125 }; 992 }
1126} 993}
1127 994
1128sub save($) { 995sub save($) {
1129 my ($pl) = @_; 996 my ($pl) = @_;
1130 997
1132 999
1133 my $path = path $pl; 1000 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path"; 1001 my $guard = cf::lock_acquire "user_save:$path";
1135 1002
1136 return if $pl->{deny_save}; 1003 return if $pl->{deny_save};
1004
1005 aio_mkdir playerdir $pl, 0770;
1137 $pl->{last_save} = $cf::RUNTIME; 1006 $pl->{last_save} = $cf::RUNTIME;
1138 1007
1139 Coro::cede;
1140 $pl->save_pl ($path); 1008 $pl->save_pl ($path);
1141 Coro::cede; 1009 Coro::cede;
1142} 1010}
1143 1011
1144sub new($) { 1012sub new($) {
1151 1019
1152 $cf::PLAYER{$login} = $self; 1020 $cf::PLAYER{$login} = $self;
1153 1021
1154 $self 1022 $self
1155} 1023}
1024
1025=item $pl->quit_character
1026
1027Nukes the player without looking back. If logged in, the connection will
1028be destroyed. May block for a long time.
1029
1030=cut
1156 1031
1157sub quit_character { 1032sub quit_character {
1158 my ($pl) = @_; 1033 my ($pl) = @_;
1159 1034
1160 $pl->{deny_save} = 1; 1035 $pl->{deny_save} = 1;
1165 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1040 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1166 $pl->ns->destroy if $pl->ns; 1041 $pl->ns->destroy if $pl->ns;
1167 1042
1168 my $path = playerdir $pl; 1043 my $path = playerdir $pl;
1169 my $temp = "$path~$cf::RUNTIME~deleting~"; 1044 my $temp = "$path~$cf::RUNTIME~deleting~";
1170 IO::AIO::aio_rename $path, $temp, sub { 1045 aio_rename $path, $temp;
1171 delete $cf::PLAYER{$pl->ob->name}; 1046 delete $cf::PLAYER{$pl->ob->name};
1172 $pl->destroy; 1047 $pl->destroy;
1173
1174 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item cf::player::list_logins
1052
1053Returns am arrayref of all valid playernames in the system, can take a
1054while and may block, so not sync_job-capable, ever.
1055
1056=cut
1057
1058sub list_logins {
1059 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1060 or return [];
1061
1062 my @logins;
1063
1064 for my $login (@$dirs) {
1065 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1066 aio_read $fh, 0, 512, my $buf, 0 or next;
1067 $buf !~ /^password -------------$/m or next; # official not-valid tag
1068
1069 utf8::decode $login;
1070 push @logins, $login;
1175 }; 1071 }
1072
1073 \@logins
1074}
1075
1076=item $player->maps
1077
1078Returns an arrayref of map paths that are private for this
1079player. May block.
1080
1081=cut
1082
1083sub maps($) {
1084 my ($pl) = @_;
1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1087
1088 my $files = aio_readdir playerdir $pl
1089 or return;
1090
1091 my @paths;
1092
1093 for (@$files) {
1094 utf8::decode $_;
1095 next if /\.(?:pl|pst)$/;
1096 next unless /^$PATH_SEP/o;
1097
1098 push @paths, cf::map::normalise "~$pl/$_";
1099 }
1100
1101 \@paths
1176} 1102}
1177 1103
1178=item $player->ext_reply ($msgid, $msgtype, %msg) 1104=item $player->ext_reply ($msgid, $msgtype, %msg)
1179 1105
1180Sends an ext reply to the player. 1106Sends an ext reply to the player.
1203package cf::map; 1129package cf::map;
1204 1130
1205use Fcntl; 1131use Fcntl;
1206use Coro::AIO; 1132use Coro::AIO;
1207 1133
1134use overload
1135 '""' => \&as_string,
1136 fallback => 1;
1137
1208our $MAX_RESET = 3600; 1138our $MAX_RESET = 3600;
1209our $DEFAULT_RESET = 3000; 1139our $DEFAULT_RESET = 3000;
1210 1140
1211sub generate_random_map { 1141sub generate_random_map {
1212 my ($path, $rmp) = @_; 1142 my ($self, $rmp) = @_;
1213
1214 # mit "rum" bekleckern, nicht 1143 # mit "rum" bekleckern, nicht
1215 cf::map::_create_random_map 1144 $self->_create_random_map (
1216 $path,
1217 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1145 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1218 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1146 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1219 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1147 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1220 $rmp->{exit_on_final_map}, 1148 $rmp->{exit_on_final_map},
1221 $rmp->{xsize}, $rmp->{ysize}, 1149 $rmp->{xsize}, $rmp->{ysize},
1222 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1150 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1223 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1151 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1224 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1152 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1225 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1153 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1226 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1154 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1227 (cf::region::find $rmp->{region}) 1155 (cf::region::find $rmp->{region}), $rmp->{custom}
1156 )
1157}
1158
1159=item cf::map->register ($regex, $prio)
1160
1161Register a handler for the map path matching the given regex at the
1162givne priority (higher is better, built-in handlers have priority 0, the
1163default).
1164
1165=cut
1166
1167sub register {
1168 my (undef, $regex, $prio) = @_;
1169 my $pkg = caller;
1170
1171 no strict;
1172 push @{"$pkg\::ISA"}, __PACKAGE__;
1173
1174 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1175}
1176
1177# also paths starting with '/'
1178$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1179
1180sub thawer_merge {
1181 my ($self, $merge) = @_;
1182
1183 # we have to keep some variables in memory intact
1184 local $self->{path};
1185 local $self->{load_path};
1186 local $self->{deny_save};
1187 local $self->{deny_reset};
1188
1189 $self->SUPER::thawer_merge ($merge);
1190}
1191
1192sub normalise {
1193 my ($path, $base) = @_;
1194
1195 $path = "$path"; # make sure its a string
1196
1197 $path =~ s/\.map$//;
1198
1199 # map plan:
1200 #
1201 # /! non-realised random map exit (special hack!)
1202 # {... are special paths that are not being touched
1203 # ?xxx/... are special absolute paths
1204 # ?random/... random maps
1205 # /... normal maps
1206 # ~user/... per-player map of a specific user
1207
1208 $path =~ s/$PATH_SEP/\//go;
1209
1210 # treat it as relative path if it starts with
1211 # something that looks reasonable
1212 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1213 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1214
1215 $base =~ s{[^/]+/?$}{};
1216 $path = "$base/$path";
1217 }
1218
1219 for ($path) {
1220 redo if s{//}{/};
1221 redo if s{/\.?/}{/};
1222 redo if s{/[^/]+/\.\./}{/};
1223 }
1224
1225 $path
1226}
1227
1228sub new_from_path {
1229 my (undef, $path, $base) = @_;
1230
1231 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1232
1233 $path = normalise $path, $base;
1234
1235 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1236 if ($path =~ $EXT_MAP{$pkg}[1]) {
1237 my $self = bless cf::map::new, $pkg;
1238 $self->{path} = $path; $self->path ($path);
1239 $self->init; # pass $1 etc.
1240 return $self;
1241 }
1242 }
1243
1244 Carp::carp "unable to resolve path '$path' (base '$base').";
1245 ()
1246}
1247
1248sub init {
1249 my ($self) = @_;
1250
1251 $self
1252}
1253
1254sub as_string {
1255 my ($self) = @_;
1256
1257 "$self->{path}"
1258}
1259
1260# the displayed name, this is a one way mapping
1261sub visible_name {
1262 &as_string
1263}
1264
1265# the original (read-only) location
1266sub load_path {
1267 my ($self) = @_;
1268
1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1270}
1271
1272# the temporary/swap location
1273sub save_path {
1274 my ($self) = @_;
1275
1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1278}
1279
1280# the unique path, undef == no special unique path
1281sub uniq_path {
1282 my ($self) = @_;
1283
1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1285 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1228} 1286}
1229 1287
1230# and all this just because we cannot iterate over 1288# and all this just because we cannot iterate over
1231# all maps in C++... 1289# all maps in C++...
1232sub change_all_map_light { 1290sub change_all_map_light {
1234 1292
1235 $_->change_map_light ($change) 1293 $_->change_map_light ($change)
1236 for grep $_->outdoor, values %cf::MAP; 1294 for grep $_->outdoor, values %cf::MAP;
1237} 1295}
1238 1296
1297sub unlink_save {
1298 my ($self) = @_;
1299
1300 utf8::encode (my $save = $self->save_path);
1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1308}
1309
1239sub try_load_header($) { 1310sub load_header_from($) {
1240 my ($path) = @_; 1311 my ($self, $path) = @_;
1241 1312
1242 utf8::encode $path; 1313 utf8::encode $path;
1243 aio_open $path, O_RDONLY, 0 1314 #aio_open $path, O_RDONLY, 0
1315 # or return;
1316
1317 $self->_load_header ($path)
1244 or return; 1318 or return;
1245 1319
1246 my $map = cf::map::new 1320 $self->{load_path} = $path;
1321
1322 1
1323}
1324
1325sub load_header_orig {
1326 my ($self) = @_;
1327
1328 $self->load_header_from ($self->load_path)
1329}
1330
1331sub load_header_temp {
1332 my ($self) = @_;
1333
1334 $self->load_header_from ($self->save_path)
1335}
1336
1337sub prepare_temp {
1338 my ($self) = @_;
1339
1340 $self->last_access ((delete $self->{last_access})
1341 || $cf::RUNTIME); #d#
1342 # safety
1343 $self->{instantiate_time} = $cf::RUNTIME
1344 if $self->{instantiate_time} > $cf::RUNTIME;
1345}
1346
1347sub prepare_orig {
1348 my ($self) = @_;
1349
1350 $self->{load_original} = 1;
1351 $self->{instantiate_time} = $cf::RUNTIME;
1352 $self->last_access ($cf::RUNTIME);
1353 $self->instantiate;
1354}
1355
1356sub load_header {
1357 my ($self) = @_;
1358
1359 if ($self->load_header_temp) {
1360 $self->prepare_temp;
1361 } else {
1362 $self->load_header_orig
1247 or return; 1363 or return;
1364 $self->prepare_orig;
1365 }
1248 1366
1249 # for better error messages only, will be overwritten 1367 1
1250 $map->path ($path);
1251
1252 $map->load_header ($path)
1253 or return;
1254
1255 $map->{load_path} = $path;
1256
1257 $map
1258} 1368}
1259 1369
1260sub find; 1370sub find;
1261sub find { 1371sub find {
1262 my ($path, $origin) = @_; 1372 my ($path, $origin) = @_;
1263 1373
1264 #warn "find<$path,$origin>\n";#d#
1265
1266 $path = new cf::path $path, $origin && $origin->path; 1374 $path = normalise $path, $origin && $origin->path;
1267 my $key = $path->as_string;
1268 1375
1269 cf::lock_wait "map_find:$key"; 1376 cf::lock_wait "map_find:$path";
1270 1377
1271 $cf::MAP{$key} || do { 1378 $cf::MAP{$path} || do {
1272 my $guard = cf::lock_acquire "map_find:$key"; 1379 my $guard = cf::lock_acquire "map_find:$path";
1273 1380 my $map = new_from_path cf::map $path
1274 # do it the slow way
1275 my $map = try_load_header $path->save_path;
1276
1277 Coro::cede;
1278
1279 if ($map) {
1280 $map->last_access ((delete $map->{last_access})
1281 || $cf::RUNTIME); #d#
1282 # safety
1283 $map->{instantiate_time} = $cf::RUNTIME
1284 if $map->{instantiate_time} > $cf::RUNTIME;
1285 } else {
1286 if (my $rmp = $path->random_map_params) {
1287 $map = generate_random_map $key, $rmp;
1288 } else {
1289 $map = try_load_header $path->load_path;
1290 }
1291
1292 $map or return; 1381 or return;
1293 1382
1294 $map->{load_original} = 1;
1295 $map->{instantiate_time} = $cf::RUNTIME;
1296 $map->last_access ($cf::RUNTIME);
1297 $map->instantiate;
1298
1299 # per-player maps become, after loading, normal maps
1300 $map->per_player (0) if $path->{user_rel};
1301 }
1302
1303 $map->path ($key);
1304 $map->{path} = $path;
1305 $map->{last_save} = $cf::RUNTIME; 1383 $map->{last_save} = $cf::RUNTIME;
1306 1384
1307 Coro::cede; 1385 $map->load_header
1386 or return;
1308 1387
1309 if ($map->should_reset) { 1388 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1389 # doing this can freeze the server in a sync job, obviously
1390 #$cf::WAIT_FOR_TICK->wait;
1310 $map->reset; 1391 $map->reset;
1311 undef $guard; 1392 undef $guard;
1312 $map = find $path 1393 return find $path;
1313 or return;
1314 } 1394 }
1315 1395
1316 $cf::MAP{$key} = $map 1396 $cf::MAP{$path} = $map
1317 } 1397 }
1318} 1398}
1399
1400sub pre_load { }
1401sub post_load { }
1319 1402
1320sub load { 1403sub load {
1321 my ($self) = @_; 1404 my ($self) = @_;
1322 1405
1406 local $self->{deny_reset} = 1; # loading can take a long time
1407
1323 my $path = $self->{path}; 1408 my $path = $self->{path};
1324 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1409 my $guard = cf::lock_acquire "map_load:$path";
1325 1410
1326 return if $self->in_memory != cf::MAP_SWAPPED; 1411 return if $self->in_memory != cf::MAP_SWAPPED;
1327 1412
1328 $self->in_memory (cf::MAP_LOADING); 1413 $self->in_memory (cf::MAP_LOADING);
1329 1414
1330 $self->alloc; 1415 $self->alloc;
1416
1417 $self->pre_load;
1418
1331 $self->load_objects ($self->{load_path}, 1) 1419 $self->_load_objects ($self->{load_path}, 1)
1332 or return; 1420 or return;
1333 1421
1334 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1422 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1335 if delete $self->{load_original}; 1423 if delete $self->{load_original};
1336 1424
1337 if (my $uniq = $path->uniq_path) { 1425 if (my $uniq = $self->uniq_path) {
1338 utf8::encode $uniq; 1426 utf8::encode $uniq;
1339 if (aio_open $uniq, O_RDONLY, 0) { 1427 if (aio_open $uniq, O_RDONLY, 0) {
1340 $self->clear_unique_items; 1428 $self->clear_unique_items;
1341 $self->load_objects ($uniq, 0); 1429 $self->_load_objects ($uniq, 0);
1342 } 1430 }
1343 } 1431 }
1344 1432
1345 Coro::cede; 1433 Coro::cede;
1346 1434
1347 # now do the right thing for maps 1435 # now do the right thing for maps
1348 $self->link_multipart_objects; 1436 $self->link_multipart_objects;
1349 1437
1350 if ($self->{path}->is_style_map) { 1438 unless ($self->{deny_activate}) {
1351 $self->{deny_save} = 1; 1439 $self->decay_objects;
1352 $self->{deny_reset} = 1;
1353 } else {
1354 $self->fix_auto_apply; 1440 $self->fix_auto_apply;
1355 $self->decay_objects;
1356 $self->update_buttons; 1441 $self->update_buttons;
1442 Coro::cede;
1357 $self->set_darkness_map; 1443 $self->set_darkness_map;
1358 $self->difficulty ($self->estimate_difficulty) 1444 $self->difficulty ($self->estimate_difficulty)
1359 unless $self->difficulty; 1445 unless $self->difficulty;
1446 Coro::cede;
1360 $self->activate; 1447 $self->activate;
1361 } 1448 }
1362 1449
1363 Coro::cede; 1450 $self->post_load;
1364 1451
1365 $self->in_memory (cf::MAP_IN_MEMORY); 1452 $self->in_memory (cf::MAP_IN_MEMORY);
1453}
1454
1455sub customise_for {
1456 my ($self, $ob) = @_;
1457
1458 return find "~" . $ob->name . "/" . $self->{path}
1459 if $self->per_player;
1460
1461 $self
1462}
1463
1464# find and load all maps in the 3x3 area around a map
1465sub load_diag {
1466 my ($map) = @_;
1467
1468 my @diag; # diagonal neighbours
1469
1470 for (0 .. 3) {
1471 my $neigh = $map->tile_path ($_)
1472 or next;
1473 $neigh = find $neigh, $map
1474 or next;
1475 $neigh->load;
1476
1477 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1478 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1479 }
1480
1481 for (@diag) {
1482 my $neigh = find @$_
1483 or next;
1484 $neigh->load;
1485 }
1366} 1486}
1367 1487
1368sub find_sync { 1488sub find_sync {
1369 my ($path, $origin) = @_; 1489 my ($path, $origin) = @_;
1370 1490
1371 cf::sync_job { cf::map::find $path, $origin } 1491 cf::sync_job { find $path, $origin }
1372} 1492}
1373 1493
1374sub do_load_sync { 1494sub do_load_sync {
1375 my ($map) = @_; 1495 my ($map) = @_;
1376 1496
1377 cf::sync_job { $map->load }; 1497 cf::sync_job { $map->load };
1378} 1498}
1379 1499
1500our %MAP_PREFETCH;
1501our $MAP_PREFETCHER = undef;
1502
1503sub find_async {
1504 my ($path, $origin) = @_;
1505
1506 $path = normalise $path, $origin && $origin->{path};
1507
1508 if (my $map = $cf::MAP{$path}) {
1509 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1510 }
1511
1512 undef $MAP_PREFETCH{$path};
1513 $MAP_PREFETCHER ||= cf::async {
1514 while (%MAP_PREFETCH) {
1515 for my $path (keys %MAP_PREFETCH) {
1516 my $map = find $path
1517 or next;
1518 $map->load;
1519
1520 delete $MAP_PREFETCH{$path};
1521 }
1522 }
1523 undef $MAP_PREFETCHER;
1524 };
1525 $MAP_PREFETCHER->prio (6);
1526
1527 ()
1528}
1529
1380sub save { 1530sub save {
1381 my ($self) = @_; 1531 my ($self) = @_;
1382 1532
1383 my $lock = cf::lock_acquire "map_data:" . $self->path; 1533 my $lock = cf::lock_acquire "map_data:" . $self->path;
1384 1534
1385 $self->{last_save} = $cf::RUNTIME; 1535 $self->{last_save} = $cf::RUNTIME;
1386 1536
1387 return unless $self->dirty; 1537 return unless $self->dirty;
1388 1538
1389 my $save = $self->{path}->save_path; utf8::encode $save; 1539 my $save = $self->save_path; utf8::encode $save;
1390 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1540 my $uniq = $self->uniq_path; utf8::encode $uniq;
1391 1541
1392 $self->{load_path} = $save; 1542 $self->{load_path} = $save;
1393 1543
1394 return if $self->{deny_save}; 1544 return if $self->{deny_save};
1395 1545
1398 cf::async { 1548 cf::async {
1399 $_->contr->save for $self->players; 1549 $_->contr->save for $self->players;
1400 }; 1550 };
1401 1551
1402 if ($uniq) { 1552 if ($uniq) {
1403 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1553 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1404 $self->save_objects ($uniq, cf::IO_UNIQUES); 1554 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1405 } else { 1555 } else {
1406 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1556 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1407 } 1557 }
1408} 1558}
1409 1559
1410sub swap_out { 1560sub swap_out {
1411 my ($self) = @_; 1561 my ($self) = @_;
1425 1575
1426sub reset_at { 1576sub reset_at {
1427 my ($self) = @_; 1577 my ($self) = @_;
1428 1578
1429 # TODO: safety, remove and allow resettable per-player maps 1579 # TODO: safety, remove and allow resettable per-player maps
1430 return 1e99 if $self->{path}{user_rel}; 1580 return 1e99 if $self->isa ("ext::map_per_player");#d#
1431 return 1e99 if $self->{deny_reset}; 1581 return 1e99 if $self->{deny_reset};
1432 1582
1433 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1583 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1434 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1584 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1435 1585
1440 my ($self) = @_; 1590 my ($self) = @_;
1441 1591
1442 $self->reset_at <= $cf::RUNTIME 1592 $self->reset_at <= $cf::RUNTIME
1443} 1593}
1444 1594
1445sub unlink_save {
1446 my ($self) = @_;
1447
1448 utf8::encode (my $save = $self->{path}->save_path);
1449 aioreq_pri 3; IO::AIO::aio_unlink $save;
1450 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1451}
1452
1453sub rename {
1454 my ($self, $new_path) = @_;
1455
1456 $self->unlink_save;
1457
1458 delete $cf::MAP{$self->path};
1459 $self->{path} = new cf::path $new_path;
1460 $self->path ($self->{path}->as_string);
1461 $cf::MAP{$self->path} = $self;
1462
1463 $self->save;
1464}
1465
1466sub reset { 1595sub reset {
1467 my ($self) = @_; 1596 my ($self) = @_;
1468 1597
1469 my $lock = cf::lock_acquire "map_data:" . $self->path; 1598 my $lock = cf::lock_acquire "map_data:$self->{path}";
1470 1599
1471 return if $self->players; 1600 return if $self->players;
1472 return if $self->{path}{user_rel};#d# 1601 return if $self->isa ("ext::map_per_player");#d#
1473 1602
1474 warn "resetting map ", $self->path;#d# 1603 warn "resetting map ", $self->path;#d#
1475 1604
1476 delete $cf::MAP{$self->path}; 1605 delete $cf::MAP{$self->path};
1606
1607 $self->in_memory (cf::MAP_SWAPPED);
1608 $self->clear;
1477 1609
1478 $_->clear_links_to ($self) for values %cf::MAP; 1610 $_->clear_links_to ($self) for values %cf::MAP;
1479 1611
1480 $self->unlink_save; 1612 $self->unlink_save;
1481 $self->destroy; 1613 $self->destroy;
1484my $nuke_counter = "aaaa"; 1616my $nuke_counter = "aaaa";
1485 1617
1486sub nuke { 1618sub nuke {
1487 my ($self) = @_; 1619 my ($self) = @_;
1488 1620
1621 delete $cf::MAP{$self->path};
1622
1623 $self->unlink_save;
1624
1625 bless $self, "cf::map";
1626 delete $self->{deny_reset};
1489 $self->{deny_save} = 1; 1627 $self->{deny_save} = 1;
1490 $self->reset_timeout (1); 1628 $self->reset_timeout (1);
1491 $self->rename ("{nuke}/" . ($nuke_counter++)); 1629 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1630
1631 $cf::MAP{$self->path} = $self;
1632
1492 $self->reset; # polite request, might not happen 1633 $self->reset; # polite request, might not happen
1493} 1634}
1494 1635
1495sub customise_for { 1636=item cf::map::unique_maps
1496 my ($map, $ob) = @_;
1497 1637
1498 if ($map->per_player) { 1638Returns an arrayref of paths of all shared maps that have
1499 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1639instantiated unique items. May block.
1500 }
1501 1640
1502 $map 1641=cut
1503}
1504 1642
1505sub emergency_save { 1643sub unique_maps() {
1506 my $freeze_guard = cf::freeze_mainloop; 1644 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1645 or return;
1507 1646
1508 warn "enter emergency perl save\n"; 1647 my @paths;
1509 1648
1510 cf::sync_job { 1649 for (@$files) {
1511 warn "begin emergency player save\n"; 1650 utf8::decode $_;
1512 $_->save for values %cf::PLAYER; 1651 next if /\.pst$/;
1513 warn "end emergency player save\n"; 1652 next unless /^$PATH_SEP/o;
1514 1653
1515 warn "begin emergency map save\n"; 1654 push @paths, cf::map::normalise $_;
1516 $_->save for values %cf::MAP;
1517 warn "end emergency map save\n";
1518 }; 1655 }
1519 1656
1520 warn "leave emergency perl save\n"; 1657 \@paths
1521} 1658}
1522 1659
1523package cf; 1660package cf;
1524 1661
1525=back 1662=back
1526 1663
1664=head3 cf::object
1665
1666=cut
1667
1668package cf::object;
1669
1670=over 4
1671
1672=item $ob->inv_recursive
1673
1674Returns the inventory of the object _and_ their inventories, recursively.
1675
1676=cut
1677
1678sub inv_recursive_;
1679sub inv_recursive_ {
1680 map { $_, inv_recursive_ $_->inv } @_
1681}
1682
1683sub inv_recursive {
1684 inv_recursive_ inv $_[0]
1685}
1686
1687package cf;
1688
1689=back
1527 1690
1528=head3 cf::object::player 1691=head3 cf::object::player
1529 1692
1530=over 4 1693=over 4
1531 1694
1571 1734
1572=item $player_object->enter_link 1735=item $player_object->enter_link
1573 1736
1574Freezes the player and moves him/her to a special map (C<{link}>). 1737Freezes the player and moves him/her to a special map (C<{link}>).
1575 1738
1576The player should be reaosnably safe there for short amounts of time. You 1739The player should be reasonably safe there for short amounts of time. You
1577I<MUST> call C<leave_link> as soon as possible, though. 1740I<MUST> call C<leave_link> as soon as possible, though.
1578 1741
1742Will never block.
1743
1579=item $player_object->leave_link ($map, $x, $y) 1744=item $player_object->leave_link ($map, $x, $y)
1580 1745
1581Moves the player out of the specila link map onto the given map. If the 1746Moves the player out of the special C<{link}> map onto the specified
1582map is not valid (or omitted), the player will be moved back to the 1747map. If the map is not valid (or omitted), the player will be moved back
1583location he/she was before the call to C<enter_link>, or, if that fails, 1748to the location he/she was before the call to C<enter_link>, or, if that
1584to the emergency map position. 1749fails, to the emergency map position.
1585 1750
1586Might block. 1751Might block.
1587 1752
1588=cut 1753=cut
1754
1755sub link_map {
1756 unless ($LINK_MAP) {
1757 $LINK_MAP = cf::map::find "{link}"
1758 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1759 $LINK_MAP->load;
1760 }
1761
1762 $LINK_MAP
1763}
1589 1764
1590sub cf::object::player::enter_link { 1765sub cf::object::player::enter_link {
1591 my ($self) = @_; 1766 my ($self) = @_;
1592 1767
1593 $self->deactivate_recursive; 1768 $self->deactivate_recursive;
1594 1769
1595 return if $self->map == $LINK_MAP; 1770 return if UNIVERSAL::isa $self->map, "ext::map_link";
1596 1771
1597 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1772 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1598 if $self->map; 1773 if $self->map;
1599 1774
1600 $self->enter_map ($LINK_MAP, 20, 20); 1775 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1601} 1776}
1602 1777
1603sub cf::object::player::leave_link { 1778sub cf::object::player::leave_link {
1604 my ($self, $map, $x, $y) = @_; 1779 my ($self, $map, $x, $y) = @_;
1605 1780
1623 # use -1 or undef as default coordinates, not 0, 0 1798 # use -1 or undef as default coordinates, not 0, 0
1624 ($x, $y) = ($map->enter_x, $map->enter_y) 1799 ($x, $y) = ($map->enter_x, $map->enter_y)
1625 if $x <=0 && $y <= 0; 1800 if $x <=0 && $y <= 0;
1626 1801
1627 $map->load; 1802 $map->load;
1803 $map->load_diag;
1628 1804
1629 return unless $self->contr->active; 1805 return unless $self->contr->active;
1630 $self->activate_recursive; 1806 $self->activate_recursive;
1631 $self->enter_map ($map, $x, $y); 1807 $self->enter_map ($map, $x, $y);
1632} 1808}
1671 my ($self, $path, $x, $y) = @_; 1847 my ($self, $path, $x, $y) = @_;
1672 1848
1673 $self->enter_link; 1849 $self->enter_link;
1674 1850
1675 (async { 1851 (async {
1676 $path = new cf::path $path; 1852 my $map = eval {
1677
1678 my $map = cf::map::find $path->as_string; 1853 my $map = cf::map::find $path;
1679 $map = $map->customise_for ($self) if $map; 1854 $map = $map->customise_for ($self) if $map;
1680 1855 $map
1681# warn "entering ", $map->path, " at ($x, $y)\n" 1856 } or
1682# if $map;
1683
1684 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1857 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1685 1858
1686 $self->leave_link ($map, $x, $y); 1859 $self->leave_link ($map, $x, $y);
1687 })->prio (1); 1860 })->prio (1);
1688} 1861}
1689 1862
1693 1866
1694sub parse_random_map_params { 1867sub parse_random_map_params {
1695 my ($spec) = @_; 1868 my ($spec) = @_;
1696 1869
1697 my $rmp = { # defaults 1870 my $rmp = { # defaults
1698 xsize => 10, 1871 xsize => (cf::rndm 15, 40),
1699 ysize => 10, 1872 ysize => (cf::rndm 15, 40),
1873 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1874 #layout => string,
1700 }; 1875 };
1701 1876
1702 for (split /\n/, $spec) { 1877 for (split /\n/, $spec) {
1703 my ($k, $v) = split /\s+/, $_, 2; 1878 my ($k, $v) = split /\s+/, $_, 2;
1704 1879
1708 $rmp 1883 $rmp
1709} 1884}
1710 1885
1711sub prepare_random_map { 1886sub prepare_random_map {
1712 my ($exit) = @_; 1887 my ($exit) = @_;
1888
1889 my $guard = cf::lock_acquire "exit_prepare:$exit";
1713 1890
1714 # all this does is basically replace the /! path by 1891 # all this does is basically replace the /! path by
1715 # a new random map path (?random/...) with a seed 1892 # a new random map path (?random/...) with a seed
1716 # that depends on the exit object 1893 # that depends on the exit object
1717 1894
1718 my $rmp = parse_random_map_params $exit->msg; 1895 my $rmp = parse_random_map_params $exit->msg;
1719 1896
1720 if ($exit->map) { 1897 if ($exit->map) {
1721 $rmp->{region} = $exit->map->region_name; 1898 $rmp->{region} = $exit->region->name;
1722 $rmp->{origin_map} = $exit->map->path; 1899 $rmp->{origin_map} = $exit->map->path;
1723 $rmp->{origin_x} = $exit->x; 1900 $rmp->{origin_x} = $exit->x;
1724 $rmp->{origin_y} = $exit->y; 1901 $rmp->{origin_y} = $exit->y;
1725 } 1902 }
1726 1903
1727 $rmp->{random_seed} ||= $exit->random_seed; 1904 $rmp->{random_seed} ||= $exit->random_seed;
1728 1905
1729 my $data = cf::to_json $rmp; 1906 my $data = cf::to_json $rmp;
1730 my $md5 = Digest::MD5::md5_hex $data; 1907 my $md5 = Digest::MD5::md5_hex $data;
1908 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1731 1909
1732 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1910 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1733 aio_write $fh, 0, (length $data), $data, 0; 1911 aio_write $fh, 0, (length $data), $data, 0;
1912 undef $fh;
1913 aio_rename "$meta~", $meta;
1734 1914
1735 $exit->slaying ("?random/$md5"); 1915 $exit->slaying ("?random/$md5");
1736 $exit->msg (undef); 1916 $exit->msg (undef);
1737 } 1917 }
1738} 1918}
1739 1919
1740sub cf::object::player::enter_exit { 1920sub cf::object::player::enter_exit {
1741 my ($self, $exit) = @_; 1921 my ($self, $exit) = @_;
1742 1922
1743 return unless $self->type == cf::PLAYER; 1923 return unless $self->type == cf::PLAYER;
1924
1925 if ($exit->slaying eq "/!") {
1926 #TODO: this should de-fi-ni-te-ly not be a sync-job
1927 cf::sync_job { prepare_random_map $exit };
1928 }
1929
1930 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1931 my $hp = $exit->stats->hp;
1932 my $sp = $exit->stats->sp;
1744 1933
1745 $self->enter_link; 1934 $self->enter_link;
1746 1935
1747 (async { 1936 (async {
1748 $self->deactivate_recursive; # just to be sure 1937 $self->deactivate_recursive; # just to be sure
1749 unless (eval { 1938 unless (eval {
1750 prepare_random_map $exit 1939 $self->goto ($slaying, $hp, $sp);
1751 if $exit->slaying eq "/!";
1752
1753 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1754 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1755 1940
1756 1; 1941 1;
1757 }) { 1942 }) {
1758 $self->message ("Something went wrong deep within the crossfire server. " 1943 $self->message ("Something went wrong deep within the crossfire server. "
1759 . "I'll try to bring you back to the map you were before. " 1944 . "I'll try to bring you back to the map you were before. "
1760 . "Please report this to the dungeon master", 1945 . "Please report this to the dungeon master!",
1761 cf::NDI_UNIQUE | cf::NDI_RED); 1946 cf::NDI_UNIQUE | cf::NDI_RED);
1762 1947
1763 warn "ERROR in enter_exit: $@"; 1948 warn "ERROR in enter_exit: $@";
1764 $self->leave_link; 1949 $self->leave_link;
1765 } 1950 }
1820 # get handled first 2005 # get handled first
1821 my $queue = delete $ns->{query_queue} 2006 my $queue = delete $ns->{query_queue}
1822 or return; # be conservative, not sure how that can happen, but we saw a crash here 2007 or return; # be conservative, not sure how that can happen, but we saw a crash here
1823 2008
1824 (shift @$queue)->[1]->($msg); 2009 (shift @$queue)->[1]->($msg);
2010 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1825 2011
1826 push @{ $ns->{query_queue} }, @$queue; 2012 push @{ $ns->{query_queue} }, @$queue;
1827 2013
1828 if (@{ $ns->{query_queue} } == @$queue) { 2014 if (@{ $ns->{query_queue} } == @$queue) {
1829 if (@$queue) { 2015 if (@$queue) {
2048 sub db_sync() { 2234 sub db_sync() {
2049 db_save if $dirty; 2235 db_save if $dirty;
2050 undef $dirty; 2236 undef $dirty;
2051 } 2237 }
2052 2238
2053 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2239 my $idle = Event->idle (
2054 db_sync; 2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2055 }); 2246 );
2056 2247
2057 sub db_dirty() { 2248 sub db_dirty() {
2058 $dirty = 1; 2249 $dirty = 1;
2059 $idle->start; 2250 $idle->start;
2060 } 2251 }
2081 }, 2272 },
2082 ); 2273 );
2083} 2274}
2084 2275
2085############################################################################# 2276#############################################################################
2086# the server's main() 2277# the server's init and main functions
2278
2279sub load_resources {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2281 or die "unable to load regions file\n";#d#
2282}
2087 2283
2088sub cfg_load { 2284sub cfg_load {
2089 open my $fh, "<:utf8", cf::confdir . "/config" 2285 open my $fh, "<:utf8", cf::confdir . "/config"
2090 or return; 2286 or return;
2091 2287
2097 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2293 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2098 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2294 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2099 2295
2100 if (exists $CFG{mlockall}) { 2296 if (exists $CFG{mlockall}) {
2101 eval { 2297 eval {
2102 $CFG{mlockall} ? &mlockall : &munlockall 2298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2103 and die "WARNING: m(un)lockall failed: $!\n"; 2299 and die "WARNING: m(un)lockall failed: $!\n";
2104 }; 2300 };
2105 warn $@ if $@; 2301 warn $@ if $@;
2106 } 2302 }
2303}
2304
2305sub init {
2306 load_resources;
2107} 2307}
2108 2308
2109sub main { 2309sub main {
2110 # we must not ever block the main coroutine 2310 # we must not ever block the main coroutine
2111 local $Coro::idle = sub { 2311 local $Coro::idle = sub {
2112 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2312 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2313 (async {
2113 async { Event::one_event }; 2314 Event::one_event;
2315 })->prio (Coro::PRIO_MAX);
2114 }; 2316 };
2115 2317
2116 cfg_load; 2318 cfg_load;
2117 db_load; 2319 db_load;
2118 load_extensions; 2320 load_extensions;
2321
2322 $TICK_WATCHER->start;
2119 Event::loop; 2323 Event::loop;
2120} 2324}
2121 2325
2122############################################################################# 2326#############################################################################
2123# initialisation 2327# initialisation and cleanup
2328
2329# install some emergency cleanup handlers
2330BEGIN {
2331 for my $signal (qw(INT HUP TERM)) {
2332 Event->signal (
2333 reentrant => 0,
2334 data => WF_AUTOCANCEL,
2335 signal => $signal,
2336 prio => 0,
2337 cb => sub {
2338 cf::cleanup "SIG$signal";
2339 },
2340 );
2341 }
2342}
2343
2344sub emergency_save() {
2345 my $freeze_guard = cf::freeze_mainloop;
2346
2347 warn "enter emergency perl save\n";
2348
2349 cf::sync_job {
2350 # use a peculiar iteration method to avoid tripping on perl
2351 # refcount bugs in for. also avoids problems with players
2352 # and maps saved/destroyed asynchronously.
2353 warn "begin emergency player save\n";
2354 for my $login (keys %cf::PLAYER) {
2355 my $pl = $cf::PLAYER{$login} or next;
2356 $pl->valid or next;
2357 $pl->save;
2358 }
2359 warn "end emergency player save\n";
2360
2361 warn "begin emergency map save\n";
2362 for my $path (keys %cf::MAP) {
2363 my $map = $cf::MAP{$path} or next;
2364 $map->valid or next;
2365 $map->save;
2366 }
2367 warn "end emergency map save\n";
2368 };
2369
2370 warn "leave emergency perl save\n";
2371}
2124 2372
2125sub reload() { 2373sub reload() {
2126 # can/must only be called in main 2374 # can/must only be called in main
2127 if ($Coro::current != $Coro::main) { 2375 if ($Coro::current != $Coro::main) {
2128 warn "can only reload from main coroutine\n"; 2376 warn "can only reload from main coroutine";
2129 return; 2377 return;
2130 } 2378 }
2131 2379
2132 warn "reloading..."; 2380 warn "reloading...";
2133 2381
2134 my $guard = freeze_mainloop; 2382 warn "cancelling server ticker";
2383 $TICK_WATCHER->cancel;
2384
2135 cf::emergency_save; 2385 cf::emergency_save;
2136 2386
2137 eval { 2387 eval {
2138 # if anything goes wrong in here, we should simply crash as we already saved 2388 # if anything goes wrong in here, we should simply crash as we already saved
2139 2389
2140 # cancel all watchers 2390 warn "syncing database to disk";
2391 cf::db_sync;
2392
2393 warn "cancelling all WF_AUTOCANCEL watchers";
2141 for (Event::all_watchers) { 2394 for (Event::all_watchers) {
2142 $_->cancel if $_->data & WF_AUTOCANCEL; 2395 $_->cancel if $_->data & WF_AUTOCANCEL;
2143 } 2396 }
2144 2397
2398 warn "flushing outstanding aio requests";
2399 for (;;) {
2400 IO::AIO::flush;
2401 Coro::cede;
2402 last unless IO::AIO::nreqs;
2403 warn "iterate...";
2404 }
2405
2145 # cancel all extension coros 2406 warn "cancelling all extension coros";
2146 $_->cancel for values %EXT_CORO; 2407 $_->cancel for values %EXT_CORO;
2147 %EXT_CORO = (); 2408 %EXT_CORO = ();
2148 2409
2149 # unload all extensions 2410 warn "removing commands";
2150 for (@exts) { 2411 %COMMAND = ();
2412
2413 warn "removing ext commands";
2414 %EXTCMD = ();
2415
2416 warn "unloading/nuking all extensions";
2417 for my $pkg (@EXTS) {
2151 warn "unloading <$_>"; 2418 warn "... unloading $pkg";
2152 unload_extension $_; 2419
2420 if (my $cb = $pkg->can ("unload")) {
2421 eval {
2422 $cb->($pkg);
2423 1
2424 } or warn "$pkg unloaded, but with errors: $@";
2153 } 2425 }
2154 2426
2427 warn "... nuking $pkg";
2428 Symbol::delete_package $pkg;
2429 }
2430
2155 # unload all modules loaded from $LIBDIR 2431 warn "unloading all perl modules loaded from $LIBDIR";
2156 while (my ($k, $v) = each %INC) { 2432 while (my ($k, $v) = each %INC) {
2157 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2433 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2158 2434
2159 warn "removing <$k>"; 2435 warn "... unloading $k";
2160 delete $INC{$k}; 2436 delete $INC{$k};
2161 2437
2162 $k =~ s/\.pm$//; 2438 $k =~ s/\.pm$//;
2163 $k =~ s/\//::/g; 2439 $k =~ s/\//::/g;
2164 2440
2167 } 2443 }
2168 2444
2169 Symbol::delete_package $k; 2445 Symbol::delete_package $k;
2170 } 2446 }
2171 2447
2172 # sync database to disk
2173 cf::db_sync;
2174 IO::AIO::flush;
2175
2176 # get rid of safe::, as good as possible 2448 warn "getting rid of safe::, as good as possible";
2177 Symbol::delete_package "safe::$_" 2449 Symbol::delete_package "safe::$_"
2178 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2450 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2179 2451
2180 # remove register_script_function callbacks
2181 # TODO
2182
2183 # unload cf.pm "a bit" 2452 warn "unloading cf.pm \"a bit\"";
2184 delete $INC{"cf.pm"}; 2453 delete $INC{"cf.pm"};
2185 2454
2186 # don't, removes xs symbols, too, 2455 # don't, removes xs symbols, too,
2187 # and global variables created in xs 2456 # and global variables created in xs
2188 #Symbol::delete_package __PACKAGE__; 2457 #Symbol::delete_package __PACKAGE__;
2189 2458
2190 # reload cf.pm 2459 warn "unload completed, starting to reload now";
2460
2191 warn "reloading cf.pm"; 2461 warn "reloading cf.pm";
2192 require cf; 2462 require cf;
2193 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2194 2464
2195 # load config and database again 2465 warn "loading config and database again";
2196 cf::cfg_load; 2466 cf::cfg_load;
2197 cf::db_load; 2467 cf::db_load;
2198 2468
2199 # load extensions
2200 warn "load extensions"; 2469 warn "loading extensions";
2201 cf::load_extensions; 2470 cf::load_extensions;
2202 2471
2203 # reattach attachments to objects 2472 warn "reattaching attachments to objects/players";
2204 warn "reattach";
2205 _global_reattach; 2473 _global_reattach;
2474 warn "reattaching attachments to maps";
2206 reattach $_ for values %MAP; 2475 reattach $_ for values %MAP;
2476
2477 warn "loading reloadable resources";
2478 load_resources;
2479
2480 warn "restarting server ticker";
2481
2482 $TICK_WATCHER->start;
2207 }; 2483 };
2208 2484
2209 if ($@) { 2485 if ($@) {
2210 warn $@; 2486 warn $@;
2211 warn "error while reloading, exiting."; 2487 warn "error while reloading, exiting.";
2212 exit 1; 2488 exit 1;
2213 } 2489 }
2214 2490
2215 warn "reloaded successfully"; 2491 warn "reloaded";
2216}; 2492};
2217 2493
2218############################################################################# 2494our $RELOAD_WATCHER; # used only during reload
2219
2220unless ($LINK_MAP) {
2221 $LINK_MAP = cf::map::new;
2222
2223 $LINK_MAP->width (41);
2224 $LINK_MAP->height (41);
2225 $LINK_MAP->alloc;
2226 $LINK_MAP->path ("{link}");
2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2229
2230 # dirty hack because... archetypes are not yet loaded
2231 Event->timer (
2232 after => 10,
2233 cb => sub {
2234 $_[0]->w->cancel;
2235
2236 # provide some exits "home"
2237 my $exit = cf::object::new "exit";
2238
2239 $exit->slaying ($EMERGENCY_POSITION->[0]);
2240 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2241 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2242
2243 $LINK_MAP->insert ($exit->clone, 19, 19);
2244 $LINK_MAP->insert ($exit->clone, 19, 20);
2245 $LINK_MAP->insert ($exit->clone, 19, 21);
2246 $LINK_MAP->insert ($exit->clone, 20, 19);
2247 $LINK_MAP->insert ($exit->clone, 20, 21);
2248 $LINK_MAP->insert ($exit->clone, 21, 19);
2249 $LINK_MAP->insert ($exit->clone, 21, 20);
2250 $LINK_MAP->insert ($exit->clone, 21, 21);
2251
2252 $exit->destroy;
2253 });
2254
2255 $LINK_MAP->{deny_save} = 1;
2256 $LINK_MAP->{deny_reset} = 1;
2257
2258 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2259}
2260
2261register "<global>", __PACKAGE__;
2262 2495
2263register_command "reload" => sub { 2496register_command "reload" => sub {
2264 my ($who, $arg) = @_; 2497 my ($who, $arg) = @_;
2265 2498
2266 if ($who->flag (FLAG_WIZ)) { 2499 if ($who->flag (FLAG_WIZ)) {
2267 $who->message ("start of reload."); 2500 $who->message ("reloading server.");
2501
2502 # doing reload synchronously and two reloads happen back-to-back,
2503 # coro crashes during coro_state_free->destroy here.
2504
2505 $RELOAD_WATCHER ||= Event->timer (
2506 reentrant => 0,
2507 after => 0,
2508 data => WF_AUTOCANCEL,
2509 cb => sub {
2268 reload; 2510 reload;
2269 $who->message ("end of reload."); 2511 undef $RELOAD_WATCHER;
2512 },
2513 );
2270 } 2514 }
2271}; 2515};
2272 2516
2273unshift @INC, $LIBDIR; 2517unshift @INC, $LIBDIR;
2518
2519my $bug_warning = 0;
2274 2520
2275$TICK_WATCHER = Event->timer ( 2521$TICK_WATCHER = Event->timer (
2276 reentrant => 0, 2522 reentrant => 0,
2523 parked => 1,
2277 prio => 0, 2524 prio => 0,
2278 at => $NEXT_TICK || $TICK, 2525 at => $NEXT_TICK || $TICK,
2279 data => WF_AUTOCANCEL, 2526 data => WF_AUTOCANCEL,
2280 cb => sub { 2527 cb => sub {
2528 if ($Coro::current != $Coro::main) {
2529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2530 unless ++$bug_warning > 10;
2531 return;
2532 }
2533
2534 $NOW = Event::time;
2535
2281 cf::server_tick; # one server iteration 2536 cf::server_tick; # one server iteration
2282 $RUNTIME += $TICK; 2537 $RUNTIME += $TICK;
2283 $NEXT_TICK += $TICK; 2538 $NEXT_TICK += $TICK;
2539
2540 $WAIT_FOR_TICK->broadcast;
2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2542
2543 Event::sweep;
2544 Coro::cede_notself;
2545
2546# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d#
2284 2548
2285 # if we are delayed by four ticks or more, skip them all 2549 # if we are delayed by four ticks or more, skip them all
2286 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2287 2551
2288 $TICK_WATCHER->at ($NEXT_TICK); 2552 $TICK_WATCHER->at ($NEXT_TICK);
2289 $TICK_WATCHER->start; 2553 $TICK_WATCHER->start;
2290 }, 2554 },
2291); 2555);
2292 2556
2293IO::AIO::max_poll_time $TICK * 0.2; 2557IO::AIO::max_poll_time $TICK * 0.1;
2294 2558
2295Event->io ( 2559undef $Coro::AIO::WATCHER;
2560$AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0,
2296 fd => IO::AIO::poll_fileno, 2562 fd => IO::AIO::poll_fileno,
2297 poll => 'r', 2563 poll => 'r',
2298 prio => 5, 2564 prio => 6,
2299 data => WF_AUTOCANCEL, 2565 data => WF_AUTOCANCEL,
2300 cb => \&IO::AIO::poll_cb, 2566 cb => \&IO::AIO::poll_cb,
2301); 2567);
2302 2568
2303Event->timer ( 2569$WRITE_RUNTIME_WATCHER = Event->timer (
2570 reentrant => 0,
2304 data => WF_AUTOCANCEL, 2571 data => WF_AUTOCANCEL,
2305 after => 0, 2572 after => 1,
2306 interval => 10, 2573 interval => 10,
2307 cb => sub { 2574 prio => 6, # keep it lowest so it acts like a watchdog
2308 (Coro::unblock_sub { 2575 cb => Coro::unblock_sub {
2309 write_runtime 2576 write_runtime
2310 or warn "ERROR: unable to write runtime file: $!"; 2577 or warn "ERROR: unable to write runtime file: $!";
2311 })->();
2312 }, 2578 },
2313); 2579);
2314 2580
2315END { cf::emergency_save } 2581END { cf::emergency_save }
2316 2582

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines