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.138 by root, Fri Jan 5 17:07:17 2007 UTC vs.
Revision 1.168 by root, Sun Jan 14 00:37:14 2007 UTC

… …
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.31 (); 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 (2); # 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
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
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;
46 53
47our %CFG; 54our %CFG;
48 55
49our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 57our $RUNTIME;
51 58
59our %PLAYER; # all users
52our %MAP; # all maps 60our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
54our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
56 69
57binmode STDOUT; 70binmode STDOUT;
58binmode STDERR; 71binmode STDERR;
59 72
60# read virtual server time, if available 73# read virtual server time, if available
… …
68mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
69mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
70mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
71mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
72 85
73# a special map that is always available
74our $LINK_MAP;
75our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
76 87
77############################################################################# 88#############################################################################
78 89
79=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
… …
104 115
105=item %cf::CFG 116=item %cf::CFG
106 117
107Configuration for the server, loaded from C</etc/crossfire/config>, or 118Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 119from wherever your confdir points to.
120
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
122
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
125processing has been done. Call C<< ->wait >> on them to maximise the
126window of cpu time available, or simply to synchronise to the server tick.
109 127
110=back 128=back
111 129
112=cut 130=cut
113 131
… …
117 utf8::encode $msg; 135 utf8::encode $msg;
118 136
119 $msg .= "\n" 137 $msg .= "\n"
120 unless $msg =~ /\n$/; 138 unless $msg =~ /\n$/;
121 139
122 LOG llevError, "cfperl: $msg"; 140 LOG llevError, $msg;
123 }; 141 };
124} 142}
125 143
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
145 163
146$Event::DIED = sub { 164$Event::DIED = sub {
147 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
148}; 166};
149 167
150my %ext_pkg;
151my @exts;
152my @hook;
153
154=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
155 169
156=over 4 170=over 4
157 171
172=item dumpval $ref
173
158=cut 174=cut
175
176sub dumpval {
177 eval {
178 local $SIG{__DIE__};
179 my $d;
180 if (1) {
181 $d = new Data::Dumper([$_[0]], ["*var"]);
182 $d->Terse(1);
183 $d->Indent(2);
184 $d->Quotekeys(0);
185 $d->Useqq(1);
186 #$d->Bless(...);
187 $d->Seen($_[1]) if @_ > 1;
188 $d = $d->Dump();
189 }
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d
192 } || "[unable to dump $_[0]: '$@']";
193}
159 194
160use JSON::Syck (); # TODO# replace by JSON::PC once working 195use JSON::Syck (); # TODO# replace by JSON::PC once working
161 196
162=item $ref = cf::from_json $json 197=item $ref = cf::from_json $json
163 198
… …
224} 259}
225 260
226sub freeze_mainloop { 261sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
228 263
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
230 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
231 $guard 270 $guard
232} 271}
272
273=item cf::async { BLOCK }
274
275Currently the same as Coro::async_pool, meaning you cannot use
276C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
277thing you are allowed to do is call C<prio> on it.
278
279=cut
280
281BEGIN { *async = \&Coro::async_pool }
233 282
234=item cf::sync_job { BLOCK } 283=item cf::sync_job { BLOCK }
235 284
236The design of crossfire+ requires that the main coro ($Coro::main) is 285The design of crossfire+ requires that the main coro ($Coro::main) is
237always able to handle events or runnable, as crossfire+ is only partly 286always able to handle events or runnable, as crossfire+ is only partly
… …
256 my $freeze_guard = freeze_mainloop; 305 my $freeze_guard = freeze_mainloop;
257 306
258 my $busy = 1; 307 my $busy = 1;
259 my @res; 308 my @res;
260 309
261 (Coro::async_pool { 310 (async {
262 @res = eval { $job->() }; 311 @res = eval { $job->() };
263 warn $@ if $@; 312 warn $@ if $@;
264 undef $busy; 313 undef $busy;
265 })->prio (Coro::PRIO_MAX); 314 })->prio (Coro::PRIO_MAX);
266 315
267 while ($busy) { 316 while ($busy) {
268 Coro::cede_notself; 317 Coro::cede or Event::one_event;
269 Event::one_event unless Coro::nready;
270 } 318 }
271 319
272 wantarray ? @res : $res[0] 320 wantarray ? @res : $res[0]
273 } else { 321 } else {
274 # we are in another coroutine, how wonderful, everything just works 322 # we are in another coroutine, how wonderful, everything just works
275 323
276 $job->() 324 $job->()
277 } 325 }
278} 326}
279 327
280=item $coro = cf::coro { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
281 329
282Creates (and readies) and returns a new coro. This coro is automcatially 330Like async, but this coro is automatically being canceled when the
283being canceled when the extension calling this is being unloaded. 331extension calling this is being unloaded.
284 332
285=cut 333=cut
286 334
287sub coro(&) { 335sub async_ext(&) {
288 my $cb = shift; 336 my $cb = shift;
289 337
290 my $coro = &Coro::async_pool ($cb); 338 my $coro = &Coro::async ($cb);
291 339
292 $coro->on_destroy (sub { 340 $coro->on_destroy (sub {
293 delete $EXT_CORO{$coro+0}; 341 delete $EXT_CORO{$coro+0};
294 }); 342 });
295 $EXT_CORO{$coro+0} = $coro; 343 $EXT_CORO{$coro+0} = $coro;
… …
320} 368}
321 369
322=back 370=back
323 371
324=cut 372=cut
325
326#############################################################################
327
328package cf::path;
329
330sub new {
331 my ($class, $path, $base) = @_;
332
333 $path = $path->as_string if ref $path;
334
335 my $self = bless { }, $class;
336
337 # {... are special paths that are not touched
338 # ?xxx/... are special absolute paths
339 # ?random/... random maps
340 # /! non-realised random map exit
341 # /... normal maps
342 # ~/... per-player maps without a specific player (DO NOT USE)
343 # ~user/... per-player map of a specific user
344
345 if ($path =~ /^{/) {
346 # fine as it is
347 } elsif ($path =~ s{^\?random/}{}) {
348 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
349 $self->{random} = cf::from_json $data;
350 } else {
351 if ($path =~ s{^~([^/]+)?}{}) {
352 $self->{user_rel} = 1;
353
354 if (defined $1) {
355 $self->{user} = $1;
356 } elsif ($base =~ m{^~([^/]+)/}) {
357 $self->{user} = $1;
358 } else {
359 warn "cannot resolve user-relative path without user <$path,$base>\n";
360 }
361 } elsif ($path =~ /^\//) {
362 # already absolute
363 } else {
364 $base =~ s{[^/]+/?$}{};
365 return $class->new ("$base/$path");
366 }
367
368 for ($path) {
369 redo if s{/\.?/}{/};
370 redo if s{/[^/]+/\.\./}{/};
371 }
372 }
373
374 $self->{path} = $path;
375
376 $self
377}
378
379# the name / primary key / in-game path
380sub as_string {
381 my ($self) = @_;
382
383 $self->{user_rel} ? "~$self->{user}$self->{path}"
384 : $self->{random} ? "?random/$self->{path}"
385 : $self->{path}
386}
387
388# the displayed name, this is a one way mapping
389sub visible_name {
390 my ($self) = @_;
391
392# if (my $rmp = $self->{random}) {
393# # todo: be more intelligent about this
394# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
395# } else {
396 $self->as_string
397# }
398}
399
400# escape the /'s in the path
401sub _escaped_path {
402 # ∕ is U+2215
403 (my $path = $_[0]{path}) =~ s/\//∕/g;
404 $path
405}
406
407# the original (read-only) location
408sub load_path {
409 my ($self) = @_;
410
411 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
412}
413
414# the temporary/swap location
415sub save_path {
416 my ($self) = @_;
417
418 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
419 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
420 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
421}
422
423# the unique path, might be eq to save_path
424sub uniq_path {
425 my ($self) = @_;
426
427 $self->{user_rel} || $self->{random}
428 ? undef
429 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
430}
431
432# return random map parameters, or undef
433sub random_map_params {
434 my ($self) = @_;
435
436 $self->{random}
437}
438
439# this is somewhat ugly, but style maps do need special treatment
440sub is_style_map {
441 $_[0]{path} =~ m{^/styles/}
442}
443
444package cf;
445 373
446############################################################################# 374#############################################################################
447 375
448=head2 ATTACHABLE OBJECTS 376=head2 ATTACHABLE OBJECTS
449 377
… …
896=cut 824=cut
897 825
898sub register_extcmd { 826sub register_extcmd {
899 my ($name, $cb) = @_; 827 my ($name, $cb) = @_;
900 828
901 my $caller = caller;
902 #warn "registering extcmd '$name' to '$caller'";
903
904 $EXTCMD{$name} = [$cb, $caller]; 829 $EXTCMD{$name} = $cb;
905} 830}
906 831
907cf::player->attach ( 832cf::player->attach (
908 on_command => sub { 833 on_command => sub {
909 my ($pl, $name, $params) = @_; 834 my ($pl, $name, $params) = @_;
… …
922 847
923 my $msg = eval { from_json $buf }; 848 my $msg = eval { from_json $buf };
924 849
925 if (ref $msg) { 850 if (ref $msg) {
926 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 851 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
927 if (my %reply = $cb->[0]->($pl, $msg)) { 852 if (my %reply = $cb->($pl, $msg)) {
928 $pl->ext_reply ($msg->{msgid}, %reply); 853 $pl->ext_reply ($msg->{msgid}, %reply);
929 } 854 }
930 } 855 }
931 } else { 856 } else {
932 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 857 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
… …
934 859
935 cf::override; 860 cf::override;
936 }, 861 },
937); 862);
938 863
939sub register {
940 my ($base, $pkg) = @_;
941
942 #TODO
943}
944
945sub load_extension { 864sub load_extension {
946 my ($path) = @_; 865 my ($path) = @_;
947 866
948 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 867 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
949 my $base = $1; 868 my $base = $1;
950 my $pkg = $1; 869 my $pkg = $1;
951 $pkg =~ s/[^[:word:]]/_/g; 870 $pkg =~ s/[^[:word:]]/_/g;
952 $pkg = "ext::$pkg"; 871 $pkg = "ext::$pkg";
953 872
954 warn "loading '$path' into '$pkg'\n"; 873 warn "... loading '$path' into '$pkg'\n";
955 874
956 open my $fh, "<:utf8", $path 875 open my $fh, "<:utf8", $path
957 or die "$path: $!"; 876 or die "$path: $!";
958 877
959 my $source = 878 my $source =
960 "package $pkg; use strict; use utf8;\n" 879 "package $pkg; use strict; use utf8;\n"
961 . "#line 1 \"$path\"\n{\n" 880 . "#line 1 \"$path\"\n{\n"
962 . (do { local $/; <$fh> }) 881 . (do { local $/; <$fh> })
963 . "\n};\n1"; 882 . "\n};\n1";
964 883
965 eval $source 884 unless (eval $source) {
966 or die $@ ? "$path: $@\n" 885 my $msg = $@ ? "$path: $@\n"
967 : "extension disabled.\n"; 886 : "extension disabled.\n";
968 887 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
969 push @exts, $pkg; 888 warn $@;
970 $ext_pkg{$base} = $pkg; 889 warn "mandatory extension failed to load, exiting.\n";
971 890 exit 1;
972# no strict 'refs'; 891 }
973# @{"$pkg\::ISA"} = ext::; 892 die $@;
974
975 register $base, $pkg;
976}
977
978sub unload_extension {
979 my ($pkg) = @_;
980
981 warn "removing extension $pkg\n";
982
983 # remove hooks
984 #TODO
985# for my $idx (0 .. $#PLUGIN_EVENT) {
986# delete $hook[$idx]{$pkg};
987# } 893 }
988 894
989 # remove commands 895 push @EXTS, $pkg;
990 for my $name (keys %COMMAND) {
991 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
992
993 if (@cb) {
994 $COMMAND{$name} = \@cb;
995 } else {
996 delete $COMMAND{$name};
997 }
998 }
999
1000 # remove extcmds
1001 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1002 delete $EXTCMD{$name};
1003 }
1004
1005 if (my $cb = $pkg->can ("unload")) {
1006 eval {
1007 $cb->($pkg);
1008 1
1009 } or warn "$pkg unloaded, but with errors: $@";
1010 }
1011
1012 Symbol::delete_package $pkg;
1013} 896}
1014 897
1015sub load_extensions { 898sub load_extensions {
1016 for my $ext (<$LIBDIR/*.ext>) { 899 for my $ext (<$LIBDIR/*.ext>) {
1017 next unless -r $ext; 900 next unless -r $ext;
… …
1021 } or warn "$ext not loaded: $@"; 904 } or warn "$ext not loaded: $@";
1022 } 905 }
1023} 906}
1024 907
1025############################################################################# 908#############################################################################
1026# load/save/clean perl data associated with a map
1027
1028*cf::mapsupport::on_clean = sub {
1029 my ($map) = @_;
1030
1031 my $path = $map->tmpname;
1032 defined $path or return;
1033
1034 unlink "$path.pst";
1035};
1036
1037cf::map->attach (prio => -10000, package => cf::mapsupport::);
1038
1039#############################################################################
1040# load/save perl data associated with player->ob objects
1041
1042sub all_objects(@) {
1043 @_, map all_objects ($_->inv), @_
1044}
1045
1046# TODO: compatibility cruft, remove when no longer needed
1047cf::player->attach (
1048 on_load => sub {
1049 my ($pl, $path) = @_;
1050
1051 for my $o (all_objects $pl->ob) {
1052 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1053 $o->set_ob_key_value ("_perl_data");
1054
1055 %$o = %{ Storable::thaw pack "H*", $value };
1056 }
1057 }
1058 },
1059);
1060
1061#############################################################################
1062 909
1063=head2 CORE EXTENSIONS 910=head2 CORE EXTENSIONS
1064 911
1065Functions and methods that extend core crossfire objects. 912Functions and methods that extend core crossfire objects.
1066 913
914=cut
915
916package cf::player;
917
918use Coro::AIO;
919
1067=head3 cf::player 920=head3 cf::player
1068 921
1069=over 4 922=over 4
1070 923
1071=item cf::player::exists $login 924=item cf::player::find $login
1072 925
1073Returns true when the given account exists. 926Returns the given player object, loading it if necessary (might block).
1074 927
1075=cut 928=cut
1076 929
1077sub cf::player::exists($) { 930sub playerdir($) {
1078 cf::player::find $_[0] 931 cf::localdir
1079 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 932 . "/"
933 . cf::playerdir
934 . "/"
935 . (ref $_[0] ? $_[0]->ob->name : $_[0])
936}
937
938sub path($) {
939 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
940
941 (playerdir $login) . "/$login.pl"
942}
943
944sub find_active($) {
945 $cf::PLAYER{$_[0]}
946 and $cf::PLAYER{$_[0]}->active
947 and $cf::PLAYER{$_[0]}
948}
949
950sub exists($) {
951 my ($login) = @_;
952
953 $cf::PLAYER{$login}
954 or cf::sync_job { !aio_stat $login }
955}
956
957sub find($) {
958 return $cf::PLAYER{$_[0]} || do {
959 my $login = $_[0];
960
961 my $guard = cf::lock_acquire "user_find:$login";
962
963 $cf::PLAYER{$_[0]} || do {
964 my $pl = load_pl path $login
965 or return;
966 $cf::PLAYER{$login} = $pl
967 }
968 }
969}
970
971sub save($) {
972 my ($pl) = @_;
973
974 return if $pl->{deny_save};
975
976 my $path = path $pl;
977 my $guard = cf::lock_acquire "user_save:$path";
978
979 return if $pl->{deny_save};
980
981 aio_mkdir playerdir $pl, 0770;
982 $pl->{last_save} = $cf::RUNTIME;
983
984 $pl->save_pl ($path);
985 Coro::cede;
986}
987
988sub new($) {
989 my ($login) = @_;
990
991 my $self = create;
992
993 $self->ob->name ($login);
994 $self->{deny_save} = 1;
995
996 $cf::PLAYER{$login} = $self;
997
998 $self
999}
1000
1001=item $pl->quit_character
1002
1003Nukes the player without looking back. If logged in, the connection will
1004be destroyed. May block for a long time.
1005
1006=cut
1007
1008sub quit_character {
1009 my ($pl) = @_;
1010
1011 $pl->{deny_save} = 1;
1012 $pl->password ("*"); # this should lock out the player until we nuked the dir
1013
1014 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1015 $pl->deactivate;
1016 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1017 $pl->ns->destroy if $pl->ns;
1018
1019 my $path = playerdir $pl;
1020 my $temp = "$path~$cf::RUNTIME~deleting~";
1021 aio_rename $path, $temp;
1022 delete $cf::PLAYER{$pl->ob->name};
1023 $pl->destroy;
1024 IO::AIO::aio_rmtree $temp;
1025}
1026
1027=item cf::player::list_logins
1028
1029Returns am arrayref of all valid playernames in the system, can take a
1030while and may block, so not sync_job-capable, ever.
1031
1032=cut
1033
1034sub list_logins {
1035 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1036 or return [];
1037
1038 my @logins;
1039
1040 for my $login (@$dirs) {
1041 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1042 aio_read $fh, 0, 512, my $buf, 0 or next;
1043 $buf !~ /^password -------------$/m or next; # official not-valid tag
1044
1045 utf8::decode $login;
1046 push @logins, $login;
1047 }
1048
1049 \@logins
1050}
1051
1052=item $player->maps
1053
1054Returns an arrayref of map paths that are private for this
1055player. May block.
1056
1057=cut
1058
1059sub maps($) {
1060 my ($pl) = @_;
1061
1062 my $files = aio_readdir playerdir $pl
1063 or return;
1064
1065 my @paths;
1066
1067 for (@$files) {
1068 utf8::decode $_;
1069 next if /\.(?:pl|pst)$/;
1070 next unless /^$PATH_SEP/o;
1071
1072 s/\.map$//;
1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1074 }
1075
1076 \@paths
1080} 1077}
1081 1078
1082=item $player->ext_reply ($msgid, $msgtype, %msg) 1079=item $player->ext_reply ($msgid, $msgtype, %msg)
1083 1080
1084Sends an ext reply to the player. 1081Sends an ext reply to the player.
1085 1082
1086=cut 1083=cut
1087 1084
1088sub cf::player::ext_reply($$$%) { 1085sub ext_reply($$$%) {
1089 my ($self, $id, %msg) = @_; 1086 my ($self, $id, %msg) = @_;
1090 1087
1091 $msg{msgid} = $id; 1088 $msg{msgid} = $id;
1092 1089
1093 $self->send ("ext " . to_json \%msg); 1090 $self->send ("ext " . cf::to_json \%msg);
1094} 1091}
1092
1093package cf;
1095 1094
1096=back 1095=back
1097 1096
1098 1097
1099=head3 cf::map 1098=head3 cf::map
… …
1105package cf::map; 1104package cf::map;
1106 1105
1107use Fcntl; 1106use Fcntl;
1108use Coro::AIO; 1107use Coro::AIO;
1109 1108
1109use overload
1110 '""' => \&as_string;
1111
1110our $MAX_RESET = 3600; 1112our $MAX_RESET = 3600;
1111our $DEFAULT_RESET = 3000; 1113our $DEFAULT_RESET = 3000;
1112 1114
1113sub generate_random_map { 1115sub generate_random_map {
1114 my ($path, $rmp) = @_; 1116 my ($self, $rmp) = @_;
1115 1117
1116 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
1117 cf::map::_create_random_map 1119 $self->_create_random_map (
1118 $path,
1119 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1120 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1121 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1122 $rmp->{exit_on_final_map}, 1123 $rmp->{exit_on_final_map},
1123 $rmp->{xsize}, $rmp->{ysize}, 1124 $rmp->{xsize}, $rmp->{ysize},
1124 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1125 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1125 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1126 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1126 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1127 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1127 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1128 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1128 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1129 (cf::region::find $rmp->{region}) 1130 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 )
1132}
1133
1134sub register {
1135 my (undef, $regex) = @_;
1136 my $pkg = caller;
1137
1138 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__;
1140
1141 $EXT_MAP{$pkg} = qr<$regex>;
1142}
1143
1144# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)};
1146
1147sub normalise {
1148 my ($path, $base) = @_;
1149
1150 # map plan:
1151 #
1152 # /! non-realised random map exit (special hack!)
1153 # {... are special paths that are not being touched
1154 # ?xxx/... are special absolute paths
1155 # ?random/... random maps
1156 # /... normal maps
1157 # ~user/... per-player map of a specific user
1158
1159 $path =~ s/$PATH_SEP/\//go;
1160
1161 # treat it as relative path if it starts with
1162 # something that looks reasonable
1163 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1164 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1165
1166 $base =~ s{[^/]+/?$}{};
1167 $path = "$base/$path";
1168 }
1169
1170 for ($path) {
1171 redo if s{//}{/};
1172 redo if s{/\.?/}{/};
1173 redo if s{/[^/]+/\.\./}{/};
1174 }
1175
1176 $path
1177}
1178
1179sub new_from_path {
1180 my (undef, $path, $base) = @_;
1181
1182 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1183
1184 $path = normalise $path, $base;
1185
1186 for my $pkg (keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) {
1188 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc.
1191 return $self;
1192 }
1193 }
1194
1195 Carp::carp "unable to resolve path '$path'.";
1196 ()
1197}
1198
1199sub init {
1200 my ($self) = @_;
1201
1202 $self
1203}
1204
1205sub as_string {
1206 my ($self) = @_;
1207
1208 "$self->{path}"
1209}
1210
1211# the displayed name, this is a one way mapping
1212sub visible_name {
1213 &as_string
1214}
1215
1216# the original (read-only) location
1217sub load_path {
1218 my ($self) = @_;
1219
1220 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1221}
1222
1223# the temporary/swap location
1224sub save_path {
1225 my ($self) = @_;
1226
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1229}
1230
1231# the unique path, undef == no special unique path
1232sub uniq_path {
1233 my ($self) = @_;
1234
1235 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1236 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1130} 1237}
1131 1238
1132# and all this just because we cannot iterate over 1239# and all this just because we cannot iterate over
1133# all maps in C++... 1240# all maps in C++...
1134sub change_all_map_light { 1241sub change_all_map_light {
… …
1136 1243
1137 $_->change_map_light ($change) 1244 $_->change_map_light ($change)
1138 for grep $_->outdoor, values %cf::MAP; 1245 for grep $_->outdoor, values %cf::MAP;
1139} 1246}
1140 1247
1248sub unlink_save {
1249 my ($self) = @_;
1250
1251 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
1254}
1255
1141sub try_load_header($) { 1256sub load_header_from($) {
1142 my ($path) = @_; 1257 my ($self, $path) = @_;
1143 1258
1144 utf8::encode $path; 1259 utf8::encode $path;
1145 aio_open $path, O_RDONLY, 0 1260 aio_open $path, O_RDONLY, 0
1146 or return; 1261 or return;
1147 1262
1148 my $map = cf::map::new 1263 $self->_load_header ($path)
1149 or return; 1264 or return;
1150 1265
1151 # for better error messages only, will be overwritten 1266 $self->{load_path} = $path;
1152 $map->path ($path);
1153 1267
1154 $map->load_header ($path) 1268 1
1269}
1270
1271sub load_orig {
1272 my ($self) = @_;
1273
1274 $self->load_header_from ($self->load_path)
1275}
1276
1277sub load_temp {
1278 my ($self) = @_;
1279
1280 $self->load_header_from ($self->save_path)
1281}
1282
1283sub load_header {
1284 my ($self) = @_;
1285
1286 if ($self->load_temp) {
1287 $self->last_access ((delete $self->{last_access})
1288 || $cf::RUNTIME); #d#
1289 # safety
1290 $self->{instantiate_time} = $cf::RUNTIME
1291 if $self->{instantiate_time} > $cf::RUNTIME;
1292 } else {
1293 $self->load_orig
1155 or return; 1294 or return;
1156 1295
1157 $map->{load_path} = $path; 1296 $self->{load_original} = 1;
1297 $self->{instantiate_time} = $cf::RUNTIME;
1298 $self->last_access ($cf::RUNTIME);
1299 $self->instantiate;
1300 }
1158 1301
1159 $map 1302 1
1160} 1303}
1161 1304
1162sub find; 1305sub find;
1163sub find { 1306sub find {
1164 my ($path, $origin) = @_; 1307 my ($path, $origin) = @_;
1165 1308
1166 #warn "find<$path,$origin>\n";#d#
1167
1168 $path = new cf::path $path, $origin && $origin->path; 1309 $path = normalise $path, $origin && $origin->path;
1169 my $key = $path->as_string;
1170 1310
1171 cf::lock_wait "map_find:$key"; 1311 cf::lock_wait "map_find:$path";
1172 1312
1173 $cf::MAP{$key} || do { 1313 $cf::MAP{$path} || do {
1174 my $guard = cf::lock_acquire "map_find:$key"; 1314 my $guard = cf::lock_acquire "map_find:$path";
1175 1315 my $map = new_from_path cf::map $path
1176 # do it the slow way
1177 my $map = try_load_header $path->save_path;
1178
1179 Coro::cede;
1180
1181 if ($map) {
1182 $map->last_access ((delete $map->{last_access})
1183 || $cf::RUNTIME); #d#
1184 # safety
1185 $map->{instantiate_time} = $cf::RUNTIME
1186 if $map->{instantiate_time} > $cf::RUNTIME;
1187 } else {
1188 if (my $rmp = $path->random_map_params) {
1189 $map = generate_random_map $key, $rmp;
1190 } else {
1191 $map = try_load_header $path->load_path;
1192 }
1193
1194 $map or return; 1316 or return;
1195 1317
1196 $map->{load_original} = 1;
1197 $map->{instantiate_time} = $cf::RUNTIME;
1198 $map->last_access ($cf::RUNTIME);
1199 $map->instantiate;
1200
1201 # per-player maps become, after loading, normal maps
1202 $map->per_player (0) if $path->{user_rel};
1203 }
1204
1205 $map->path ($key);
1206 $map->{path} = $path;
1207 $map->{last_save} = $cf::RUNTIME; 1318 $map->{last_save} = $cf::RUNTIME;
1208 1319
1209 Coro::cede; 1320 $map->load_header
1321 or return;
1210 1322
1211 if ($map->should_reset) { 1323 if ($map->should_reset) {
1212 $map->reset; 1324 $map->reset;
1213 undef $guard; 1325 undef $guard;
1214 $map = find $path 1326 $map = find $path
1215 or return; 1327 or return;
1216 } 1328 }
1217 1329
1218 $cf::MAP{$key} = $map 1330 $cf::MAP{$path} = $map
1219 } 1331 }
1220} 1332}
1221 1333
1222sub load { 1334sub load {
1223 my ($self) = @_; 1335 my ($self) = @_;
1224 1336
1225 my $path = $self->{path}; 1337 my $path = $self->{path};
1226 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1338 my $guard = cf::lock_acquire "map_load:$path";
1227 1339
1228 return if $self->in_memory != cf::MAP_SWAPPED; 1340 return if $self->in_memory != cf::MAP_SWAPPED;
1229 1341
1230 $self->in_memory (cf::MAP_LOADING); 1342 $self->in_memory (cf::MAP_LOADING);
1231 1343
1232 $self->alloc; 1344 $self->alloc;
1233 $self->load_objects ($self->{load_path}, 1) 1345 $self->_load_objects ($self->{load_path}, 1)
1234 or return; 1346 or return;
1235 1347
1236 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1237 if delete $self->{load_original}; 1349 if delete $self->{load_original};
1238 1350
1239 if (my $uniq = $path->uniq_path) { 1351 if (my $uniq = $self->uniq_path) {
1240 utf8::encode $uniq; 1352 utf8::encode $uniq;
1241 if (aio_open $uniq, O_RDONLY, 0) { 1353 if (aio_open $uniq, O_RDONLY, 0) {
1242 $self->clear_unique_items; 1354 $self->clear_unique_items;
1243 $self->load_objects ($uniq, 0); 1355 $self->_load_objects ($uniq, 0);
1244 } 1356 }
1245 } 1357 }
1246 1358
1247 Coro::cede; 1359 Coro::cede;
1248 1360
1249 # now do the right thing for maps 1361 # now do the right thing for maps
1250 $self->link_multipart_objects; 1362 $self->link_multipart_objects;
1251 1363
1252 if ($self->{path}->is_style_map) { 1364 unless ($self->{deny_activate}) {
1253 $self->{deny_save} = 1; 1365 $self->decay_objects;
1254 $self->{deny_reset} = 1;
1255 } else {
1256 $self->fix_auto_apply; 1366 $self->fix_auto_apply;
1257 $self->decay_objects;
1258 $self->update_buttons; 1367 $self->update_buttons;
1368 Coro::cede;
1259 $self->set_darkness_map; 1369 $self->set_darkness_map;
1260 $self->difficulty ($self->estimate_difficulty) 1370 $self->difficulty ($self->estimate_difficulty)
1261 unless $self->difficulty; 1371 unless $self->difficulty;
1372 Coro::cede;
1262 $self->activate; 1373 $self->activate;
1263 } 1374 }
1264 1375
1265 Coro::cede;
1266
1267 $self->in_memory (cf::MAP_IN_MEMORY); 1376 $self->in_memory (cf::MAP_IN_MEMORY);
1377}
1378
1379sub customise_for {
1380 my ($self, $ob) = @_;
1381
1382 return find "~" . $ob->name . "/" . $self->{path}
1383 if $self->per_player;
1384
1385 $self
1386}
1387
1388# find and load all maps in the 3x3 area around a map
1389sub load_diag {
1390 my ($map) = @_;
1391
1392 my @diag; # diagonal neighbours
1393
1394 for (0 .. 3) {
1395 my $neigh = $map->tile_path ($_)
1396 or next;
1397 $neigh = find $neigh, $map
1398 or next;
1399 $neigh->load;
1400
1401 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1402 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1403 }
1404
1405 for (@diag) {
1406 my $neigh = find @$_
1407 or next;
1408 $neigh->load;
1409 }
1268} 1410}
1269 1411
1270sub find_sync { 1412sub find_sync {
1271 my ($path, $origin) = @_; 1413 my ($path, $origin) = @_;
1272 1414
1273 cf::sync_job { cf::map::find $path, $origin } 1415 cf::sync_job { find $path, $origin }
1274} 1416}
1275 1417
1276sub do_load_sync { 1418sub do_load_sync {
1277 my ($map) = @_; 1419 my ($map) = @_;
1278 1420
1279 cf::sync_job { $map->load }; 1421 cf::sync_job { $map->load };
1280} 1422}
1281 1423
1424our %MAP_PREFETCH;
1425our $MAP_PREFETCHER = Coro::async {
1426 while () {
1427 for my $path (keys %MAP_PREFETCH) {
1428 my $map = find $path
1429 or next;
1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1433 }
1434 Coro::schedule;
1435 }
1436};
1437
1438sub find_async {
1439 my ($path, $origin) = @_;
1440
1441 $path = normalise $path, $origin && $origin->{path};
1442
1443 if (my $map = $cf::MAP{$path}) {
1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1445 }
1446
1447 $MAP_PREFETCH{$path} = 0;
1448 $MAP_PREFETCHER->ready;
1449
1450 ()
1451}
1452
1282sub save { 1453sub save {
1283 my ($self) = @_; 1454 my ($self) = @_;
1284 1455
1285 my $lock = cf::lock_acquire "map_data:" . $self->path; 1456 my $lock = cf::lock_acquire "map_data:" . $self->path;
1286 1457
1287 $self->{last_save} = $cf::RUNTIME; 1458 $self->{last_save} = $cf::RUNTIME;
1288 1459
1289 return unless $self->dirty; 1460 return unless $self->dirty;
1290 1461
1291 my $save = $self->{path}->save_path; utf8::encode $save; 1462 my $save = $self->save_path; utf8::encode $save;
1292 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1463 my $uniq = $self->uniq_path; utf8::encode $uniq;
1293 1464
1294 $self->{load_path} = $save; 1465 $self->{load_path} = $save;
1295 1466
1296 return if $self->{deny_save}; 1467 return if $self->{deny_save};
1297 1468
1298 local $self->{last_access} = $self->last_access;#d# 1469 local $self->{last_access} = $self->last_access;#d#
1299 1470
1471 cf::async {
1472 $_->contr->save for $self->players;
1473 };
1474
1300 if ($uniq) { 1475 if ($uniq) {
1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1476 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1302 $self->save_objects ($uniq, cf::IO_UNIQUES); 1477 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1303 } else { 1478 } else {
1304 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1479 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1305 } 1480 }
1306} 1481}
1307 1482
1308sub swap_out { 1483sub swap_out {
1309 my ($self) = @_; 1484 my ($self) = @_;
… …
1323 1498
1324sub reset_at { 1499sub reset_at {
1325 my ($self) = @_; 1500 my ($self) = @_;
1326 1501
1327 # TODO: safety, remove and allow resettable per-player maps 1502 # TODO: safety, remove and allow resettable per-player maps
1328 return 1e99 if $self->{path}{user_rel}; 1503 return 1e99 if $self->isa ("ext::map_per_player");
1329 return 1e99 if $self->{deny_reset}; 1504 return 1e99 if $self->{deny_reset};
1330 1505
1331 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1332 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1333 1508
… …
1338 my ($self) = @_; 1513 my ($self) = @_;
1339 1514
1340 $self->reset_at <= $cf::RUNTIME 1515 $self->reset_at <= $cf::RUNTIME
1341} 1516}
1342 1517
1343sub unlink_save {
1344 my ($self) = @_;
1345
1346 utf8::encode (my $save = $self->{path}->save_path);
1347 aioreq_pri 3; IO::AIO::aio_unlink $save;
1348 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1349}
1350
1351sub rename { 1518sub rename {
1352 my ($self, $new_path) = @_; 1519 my ($self, $new_path) = @_;
1353 1520
1521 normalise $new_path;
1522
1354 $self->unlink_save; 1523 $self->unlink_save;
1355 1524
1356 delete $cf::MAP{$self->path}; 1525 delete $cf::MAP{$self->path};
1357 $self->{path} = new cf::path $new_path; 1526 $self->{path} = $new_path; $self->path ($self->{path});
1358 $self->path ($self->{path}->as_string);
1359 $cf::MAP{$self->path} = $self; 1527 $cf::MAP{$self->path} = $self;
1360 1528
1361 $self->save; 1529 $self->save;
1362} 1530}
1363 1531
1364sub reset { 1532sub reset {
1365 my ($self) = @_; 1533 my ($self) = @_;
1366 1534
1367 my $lock = cf::lock_acquire "map_data:" . $self->path; 1535 my $lock = cf::lock_acquire "map_data:$self->{path}";
1368 1536
1369 return if $self->players; 1537 return if $self->players;
1370 return if $self->{path}{user_rel};#d# 1538 return if $self->isa ("ext::map_per_player");#d#
1371 1539
1372 warn "resetting map ", $self->path;#d# 1540 warn "resetting map ", $self->path;#d#
1373 1541
1374 delete $cf::MAP{$self->path}; 1542 delete $cf::MAP{$self->path};
1543
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear;
1375 1546
1376 $_->clear_links_to ($self) for values %cf::MAP; 1547 $_->clear_links_to ($self) for values %cf::MAP;
1377 1548
1378 $self->unlink_save; 1549 $self->unlink_save;
1379 $self->destroy; 1550 $self->destroy;
… …
1388 $self->reset_timeout (1); 1559 $self->reset_timeout (1);
1389 $self->rename ("{nuke}/" . ($nuke_counter++)); 1560 $self->rename ("{nuke}/" . ($nuke_counter++));
1390 $self->reset; # polite request, might not happen 1561 $self->reset; # polite request, might not happen
1391} 1562}
1392 1563
1393sub customise_for { 1564=item cf::map::unique_maps
1394 my ($map, $ob) = @_;
1395 1565
1396 if ($map->per_player) { 1566Returns an arrayref of paths of all shared maps that have
1397 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1567instantiated unique items. May block.
1398 }
1399 1568
1400 $map 1569=cut
1401}
1402 1570
1403sub emergency_save { 1571sub unique_maps() {
1404 my $freeze_guard = cf::freeze_mainloop; 1572 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1573 or return;
1405 1574
1406 warn "enter emergency map save\n"; 1575 my @paths;
1407 1576
1408 cf::sync_job { 1577 for (@$files) {
1409 warn "begin emergency map save\n"; 1578 utf8::decode $_;
1410 $_->save for values %cf::MAP; 1579 next if /\.pst$/;
1580 next unless /^$PATH_SEP/o;
1581
1582 s/\.map$//;
1583 push @paths, $_;
1411 }; 1584 }
1412 1585
1413 warn "end emergency map save\n"; 1586 \@paths
1414} 1587}
1415 1588
1416package cf; 1589package cf;
1417 1590
1418=back 1591=back
1419 1592
1593=head3 cf::object
1594
1595=cut
1596
1597package cf::object;
1598
1599=over 4
1600
1601=item $ob->inv_recursive
1602
1603Returns the inventory of the object _and_ their inventories, recursively.
1604
1605=cut
1606
1607sub inv_recursive_;
1608sub inv_recursive_ {
1609 map { $_, inv_recursive_ $_->inv } @_
1610}
1611
1612sub inv_recursive {
1613 inv_recursive_ inv $_[0]
1614}
1615
1616package cf;
1617
1618=back
1420 1619
1421=head3 cf::object::player 1620=head3 cf::object::player
1422 1621
1423=over 4 1622=over 4
1424 1623
… …
1464 1663
1465=item $player_object->enter_link 1664=item $player_object->enter_link
1466 1665
1467Freezes the player and moves him/her to a special map (C<{link}>). 1666Freezes the player and moves him/her to a special map (C<{link}>).
1468 1667
1469The player should be reaosnably safe there for short amounts of time. You 1668The player should be reasonably safe there for short amounts of time. You
1470I<MUST> call C<leave_link> as soon as possible, though. 1669I<MUST> call C<leave_link> as soon as possible, though.
1471 1670
1671Will never block.
1672
1472=item $player_object->leave_link ($map, $x, $y) 1673=item $player_object->leave_link ($map, $x, $y)
1473 1674
1474Moves the player out of the specila link map onto the given map. If the 1675Moves the player out of the special C<{link}> map onto the specified
1475map is not valid (or omitted), the player will be moved back to the 1676map. If the map is not valid (or omitted), the player will be moved back
1476location he/she was before the call to C<enter_link>, or, if that fails, 1677to the location he/she was before the call to C<enter_link>, or, if that
1477to the emergency map position. 1678fails, to the emergency map position.
1478 1679
1479Might block. 1680Might block.
1480 1681
1481=cut 1682=cut
1683
1684sub link_map {
1685 unless ($LINK_MAP) {
1686 $LINK_MAP = cf::map::find "{link}"
1687 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1688 $LINK_MAP->load;
1689 }
1690
1691 $LINK_MAP
1692}
1482 1693
1483sub cf::object::player::enter_link { 1694sub cf::object::player::enter_link {
1484 my ($self) = @_; 1695 my ($self) = @_;
1485 1696
1486 $self->deactivate_recursive; 1697 $self->deactivate_recursive;
1487 1698
1488 return if $self->map == $LINK_MAP; 1699 return if UNIVERSAL::isa $self->map, "ext::map_link";
1489 1700
1490 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1491 if $self->map; 1702 if $self->map;
1492 1703
1493 $self->enter_map ($LINK_MAP, 20, 20); 1704 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1494} 1705}
1495 1706
1496sub cf::object::player::leave_link { 1707sub cf::object::player::leave_link {
1497 my ($self, $map, $x, $y) = @_; 1708 my ($self, $map, $x, $y) = @_;
1498 1709
… …
1516 # use -1 or undef as default coordinates, not 0, 0 1727 # use -1 or undef as default coordinates, not 0, 0
1517 ($x, $y) = ($map->enter_x, $map->enter_y) 1728 ($x, $y) = ($map->enter_x, $map->enter_y)
1518 if $x <=0 && $y <= 0; 1729 if $x <=0 && $y <= 0;
1519 1730
1520 $map->load; 1731 $map->load;
1732 $map->load_diag;
1521 1733
1734 return unless $self->contr->active;
1522 $self->activate_recursive; 1735 $self->activate_recursive;
1523 $self->enter_map ($map, $x, $y); 1736 $self->enter_map ($map, $x, $y);
1524} 1737}
1525 1738
1526cf::player->attach ( 1739cf::player->attach (
… …
1539 1752
1540 # try to abort aborted map switching on player login :) 1753 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes 1754 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) { 1755 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link; 1756 $pl->ob->enter_link;
1544 Coro::async_pool { 1757 (async {
1545 # we need this sleep as the login has a concurrent enter_exit running 1758 # we need this sleep as the login has a concurrent enter_exit running
1546 # and this sleep increases chances of the player not ending up in scorn 1759 # and this sleep increases chances of the player not ending up in scorn
1760 $pl->ob->reply (undef,
1761 "There was an internal problem at your last logout, "
1762 . "the server will try to bring you to your intended destination in a second.",
1763 cf::NDI_RED);
1547 Coro::Timer::sleep 1; 1764 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link; 1765 $pl->ob->leave_link;
1549 }; 1766 })->prio (2);
1550 } 1767 }
1551 }, 1768 },
1552); 1769);
1553 1770
1554=item $player_object->goto ($path, $x, $y) 1771=item $player_object->goto ($path, $x, $y)
… …
1558sub cf::object::player::goto { 1775sub cf::object::player::goto {
1559 my ($self, $path, $x, $y) = @_; 1776 my ($self, $path, $x, $y) = @_;
1560 1777
1561 $self->enter_link; 1778 $self->enter_link;
1562 1779
1563 (Coro::async_pool { 1780 (async {
1564 $path = new cf::path $path;
1565
1566 my $map = cf::map::find $path->as_string; 1781 my $map = cf::map::find $path;
1567 $map = $map->customise_for ($self) if $map; 1782 $map = $map->customise_for ($self) if $map;
1568 1783
1569# warn "entering ", $map->path, " at ($x, $y)\n" 1784# warn "entering ", $map->path, " at ($x, $y)\n"
1570# if $map; 1785# if $map;
1571 1786
1572 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1787 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1573 1788
1574 $self->leave_link ($map, $x, $y); 1789 $self->leave_link ($map, $x, $y);
1575 })->prio (1); 1790 })->prio (1);
1576} 1791}
1577 1792
… …
1630 1845
1631 return unless $self->type == cf::PLAYER; 1846 return unless $self->type == cf::PLAYER;
1632 1847
1633 $self->enter_link; 1848 $self->enter_link;
1634 1849
1635 (Coro::async_pool { 1850 (async {
1636 $self->deactivate_recursive; # just to be sure 1851 $self->deactivate_recursive; # just to be sure
1637 unless (eval { 1852 unless (eval {
1638 prepare_random_map $exit 1853 prepare_random_map $exit
1639 if $exit->slaying eq "/!"; 1854 if $exit->slaying eq "/!";
1640 1855
1641 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1856 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1642 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1643 1858
1644 1; 1859 1;
1645 }) { 1860 }) {
1646 $self->message ("Something went wrong deep within the crossfire server. " 1861 $self->message ("Something went wrong deep within the crossfire server. "
1647 . "I'll try to bring you back to the map you were before. " 1862 . "I'll try to bring you back to the map you were before. "
1648 . "Please report this to the dungeon master", 1863 . "Please report this to the dungeon master!",
1649 cf::NDI_UNIQUE | cf::NDI_RED); 1864 cf::NDI_UNIQUE | cf::NDI_RED);
1650 1865
1651 warn "ERROR in enter_exit: $@"; 1866 warn "ERROR in enter_exit: $@";
1652 $self->leave_link; 1867 $self->leave_link;
1653 } 1868 }
… …
1721 } 1936 }
1722 } 1937 }
1723 }, 1938 },
1724); 1939);
1725 1940
1726=item $client->coro (\&cb) 1941=item $client->async (\&cb)
1727 1942
1728Create a new coroutine, running the specified callback. The coroutine will 1943Create a new coroutine, running the specified callback. The coroutine will
1729be automatically cancelled when the client gets destroyed (e.g. on logout, 1944be automatically cancelled when the client gets destroyed (e.g. on logout,
1730or loss of connection). 1945or loss of connection).
1731 1946
1732=cut 1947=cut
1733 1948
1734sub cf::client::coro { 1949sub cf::client::async {
1735 my ($self, $cb) = @_; 1950 my ($self, $cb) = @_;
1736 1951
1737 my $coro = &Coro::async_pool ($cb); 1952 my $coro = &Coro::async ($cb);
1738 1953
1739 $coro->on_destroy (sub { 1954 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1955 delete $self->{_coro}{$coro+0};
1741 }); 1956 });
1742 1957
… …
1980 local $/; 2195 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2196 *CFG = YAML::Syck::Load <$fh>;
1982 2197
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2198 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984 2199
2200 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2201 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2202
1985 if (exists $CFG{mlockall}) { 2203 if (exists $CFG{mlockall}) {
1986 eval { 2204 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall 2205 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1988 and die "WARNING: m(un)lockall failed: $!\n"; 2206 and die "WARNING: m(un)lockall failed: $!\n";
1989 }; 2207 };
1990 warn $@ if $@; 2208 warn $@ if $@;
1991 } 2209 }
1992} 2210}
1993 2211
1994sub main { 2212sub main {
1995 # we must not ever block the main coroutine 2213 # we must not ever block the main coroutine
1996 local $Coro::idle = sub { 2214 local $Coro::idle = sub {
1997 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2215 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1998 (Coro::unblock_sub {
1999 Event::one_event; 2216 async { Event::one_event };
2000 })->();
2001 }; 2217 };
2002 2218
2003 cfg_load; 2219 cfg_load;
2004 db_load; 2220 db_load;
2005 load_extensions; 2221 load_extensions;
2006 Event::loop; 2222 Event::loop;
2007} 2223}
2008 2224
2009############################################################################# 2225#############################################################################
2010# initialisation 2226# initialisation and cleanup
2227
2228# install some emergency cleanup handlers
2229BEGIN {
2230 for my $signal (qw(INT HUP TERM)) {
2231 Event->signal (
2232 data => WF_AUTOCANCEL,
2233 signal => $signal,
2234 cb => sub {
2235 cf::cleanup "SIG$signal";
2236 },
2237 );
2238 }
2239}
2240
2241sub emergency_save() {
2242 my $freeze_guard = cf::freeze_mainloop;
2243
2244 warn "enter emergency perl save\n";
2245
2246 cf::sync_job {
2247 # use a peculiar iteration method to avoid tripping on perl
2248 # refcount bugs in for. also avoids problems with players
2249 # and maps saved/destroyed asynchronously.
2250 warn "begin emergency player save\n";
2251 for my $login (keys %cf::PLAYER) {
2252 my $pl = $cf::PLAYER{$login} or next;
2253 $pl->valid or next;
2254 $pl->save;
2255 }
2256 warn "end emergency player save\n";
2257
2258 warn "begin emergency map save\n";
2259 for my $path (keys %cf::MAP) {
2260 my $map = $cf::MAP{$path} or next;
2261 $map->valid or next;
2262 $map->save;
2263 }
2264 warn "end emergency map save\n";
2265 };
2266
2267 warn "leave emergency perl save\n";
2268}
2011 2269
2012sub reload() { 2270sub reload() {
2013 # can/must only be called in main 2271 # can/must only be called in main
2014 if ($Coro::current != $Coro::main) { 2272 if ($Coro::current != $Coro::main) {
2015 warn "can only reload from main coroutine\n"; 2273 warn "can only reload from main coroutine\n";
2016 return; 2274 return;
2017 } 2275 }
2018 2276
2019 warn "reloading..."; 2277 warn "reloading...";
2020 2278
2279 warn "freezing server";
2021 my $guard = freeze_mainloop; 2280 my $guard = freeze_mainloop;
2022 cf::emergency_save; 2281 cf::emergency_save;
2023 2282
2283 warn "sync database to disk";
2284 cf::db_sync;
2285 IO::AIO::flush;
2286
2024 eval { 2287 eval {
2025 # if anything goes wrong in here, we should simply crash as we already saved 2288 # if anything goes wrong in here, we should simply crash as we already saved
2026 2289
2027 # cancel all watchers 2290 warn "cancel all watchers";
2028 for (Event::all_watchers) { 2291 for (Event::all_watchers) {
2029 $_->cancel if $_->data & WF_AUTOCANCEL; 2292 $_->cancel if $_->data & WF_AUTOCANCEL;
2030 } 2293 }
2031 2294
2032 # cancel all extension coros 2295 warn "cancel all extension coros";
2033 $_->cancel for values %EXT_CORO; 2296 $_->cancel for values %EXT_CORO;
2034 %EXT_CORO = (); 2297 %EXT_CORO = ();
2035 2298
2299 warn "remove commands";
2300 %COMMAND = ();
2301
2302 warn "remove ext commands";
2303 %EXTCMD = ();
2304
2036 # unload all extensions 2305 warn "unload/nuke all extensions";
2037 for (@exts) { 2306 for my $pkg (@EXTS) {
2038 warn "unloading <$_>"; 2307 warn "... unloading $pkg";
2039 unload_extension $_; 2308
2309 if (my $cb = $pkg->can ("unload")) {
2310 eval {
2311 $cb->($pkg);
2312 1
2313 } or warn "$pkg unloaded, but with errors: $@";
2040 } 2314 }
2041 2315
2316 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg;
2318 }
2319
2042 # unload all modules loaded from $LIBDIR 2320 warn "unload all perl modules loaded from $LIBDIR";
2043 while (my ($k, $v) = each %INC) { 2321 while (my ($k, $v) = each %INC) {
2044 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2045 2323
2046 warn "removing <$k>"; 2324 warn "removing <$k>";
2047 delete $INC{$k}; 2325 delete $INC{$k};
… …
2054 } 2332 }
2055 2333
2056 Symbol::delete_package $k; 2334 Symbol::delete_package $k;
2057 } 2335 }
2058 2336
2059 # sync database to disk
2060 cf::db_sync;
2061 IO::AIO::flush;
2062
2063 # get rid of safe::, as good as possible 2337 warn "get rid of safe::, as good as possible";
2064 Symbol::delete_package "safe::$_" 2338 Symbol::delete_package "safe::$_"
2065 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2339 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2066 2340
2067 # remove register_script_function callbacks
2068 # TODO
2069
2070 # unload cf.pm "a bit" 2341 warn "unload cf.pm \"a bit\"";
2071 delete $INC{"cf.pm"}; 2342 delete $INC{"cf.pm"};
2072 2343
2073 # don't, removes xs symbols, too, 2344 # don't, removes xs symbols, too,
2074 # and global variables created in xs 2345 # and global variables created in xs
2075 #Symbol::delete_package __PACKAGE__; 2346 #Symbol::delete_package __PACKAGE__;
2076 2347
2077 # reload cf.pm
2078 warn "reloading cf.pm"; 2348 warn "reloading cf.pm";
2079 require cf; 2349 require cf;
2080 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2081 2351
2082 # load config and database again 2352 warn "load config and database again";
2083 cf::cfg_load; 2353 cf::cfg_load;
2084 cf::db_load; 2354 cf::db_load;
2085 2355
2086 # load extensions
2087 warn "load extensions"; 2356 warn "load extensions";
2088 cf::load_extensions; 2357 cf::load_extensions;
2089 2358
2090 # reattach attachments to objects 2359 warn "reattach attachments to objects/players";
2091 warn "reattach";
2092 _global_reattach; 2360 _global_reattach;
2361 warn "reattach attachments to maps";
2362 reattach $_ for values %MAP;
2093 }; 2363 };
2094 2364
2095 if ($@) { 2365 if ($@) {
2096 warn $@; 2366 warn $@;
2097 warn "error while reloading, exiting."; 2367 warn "error while reloading, exiting.";
2098 exit 1; 2368 exit 1;
2099 } 2369 }
2100 2370
2101 warn "reloaded successfully"; 2371 warn "reloaded";
2102}; 2372};
2103
2104#############################################################################
2105
2106unless ($LINK_MAP) {
2107 $LINK_MAP = cf::map::new;
2108
2109 $LINK_MAP->width (41);
2110 $LINK_MAP->height (41);
2111 $LINK_MAP->alloc;
2112 $LINK_MAP->path ("{link}");
2113 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2114 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2115
2116 # dirty hack because... archetypes are not yet loaded
2117 Event->timer (
2118 after => 2,
2119 cb => sub {
2120 $_[0]->w->cancel;
2121
2122 # provide some exits "home"
2123 my $exit = cf::object::new "exit";
2124
2125 $exit->slaying ($EMERGENCY_POSITION->[0]);
2126 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2127 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2128
2129 $LINK_MAP->insert ($exit->clone, 19, 19);
2130 $LINK_MAP->insert ($exit->clone, 19, 20);
2131 $LINK_MAP->insert ($exit->clone, 19, 21);
2132 $LINK_MAP->insert ($exit->clone, 20, 19);
2133 $LINK_MAP->insert ($exit->clone, 20, 21);
2134 $LINK_MAP->insert ($exit->clone, 21, 19);
2135 $LINK_MAP->insert ($exit->clone, 21, 20);
2136 $LINK_MAP->insert ($exit->clone, 21, 21);
2137
2138 $exit->destroy;
2139 });
2140
2141 $LINK_MAP->{deny_save} = 1;
2142 $LINK_MAP->{deny_reset} = 1;
2143
2144 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2145}
2146
2147register "<global>", __PACKAGE__;
2148 2373
2149register_command "reload" => sub { 2374register_command "reload" => sub {
2150 my ($who, $arg) = @_; 2375 my ($who, $arg) = @_;
2151 2376
2152 if ($who->flag (FLAG_WIZ)) { 2377 if ($who->flag (FLAG_WIZ)) {
… …
2162 reentrant => 0, 2387 reentrant => 0,
2163 prio => 0, 2388 prio => 0,
2164 at => $NEXT_TICK || $TICK, 2389 at => $NEXT_TICK || $TICK,
2165 data => WF_AUTOCANCEL, 2390 data => WF_AUTOCANCEL,
2166 cb => sub { 2391 cb => sub {
2392 $NOW = Event::time;
2393
2167 cf::server_tick; # one server iteration 2394 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2395 $RUNTIME += $TICK;
2169 $NEXT_TICK += $TICK; 2396 $NEXT_TICK += $TICK;
2397
2398 $WAIT_FOR_TICK->broadcast;
2399 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2170 2400
2171 # if we are delayed by four ticks or more, skip them all 2401 # if we are delayed by four ticks or more, skip them all
2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2402 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2173 2403
2174 $TICK_WATCHER->at ($NEXT_TICK); 2404 $TICK_WATCHER->at ($NEXT_TICK);
… …
2176 }, 2406 },
2177); 2407);
2178 2408
2179IO::AIO::max_poll_time $TICK * 0.2; 2409IO::AIO::max_poll_time $TICK * 0.2;
2180 2410
2181Event->io ( 2411$AIO_POLL_WATCHER = Event->io (
2182 fd => IO::AIO::poll_fileno, 2412 fd => IO::AIO::poll_fileno,
2183 poll => 'r', 2413 poll => 'r',
2184 prio => 5, 2414 prio => 5,
2185 data => WF_AUTOCANCEL, 2415 data => WF_AUTOCANCEL,
2186 cb => \&IO::AIO::poll_cb, 2416 cb => \&IO::AIO::poll_cb,
2187); 2417);
2188 2418
2189Event->timer ( 2419$WRITE_RUNTIME_WATCHER = Event->timer (
2190 data => WF_AUTOCANCEL, 2420 data => WF_AUTOCANCEL,
2191 after => 0, 2421 after => 0,
2192 interval => 10, 2422 interval => 10,
2193 cb => sub { 2423 cb => sub {
2194 (Coro::unblock_sub { 2424 (Coro::unblock_sub {

Diff Legend

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