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.115 by root, Mon Jan 1 16:50:10 2007 UTC vs.
Revision 1.165 by root, Fri Jan 12 22:09: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.3 ();
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.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;
47our %CFG; 52our %CFG;
48 53
49our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 55our $RUNTIME;
51 56
57our %PLAYER; # all users
52our %MAP; # all maps 58our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
57 64
58binmode STDOUT; 65binmode STDOUT;
59binmode STDERR; 66binmode STDERR;
60 67
61# read virtual server time, if available 68# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 78mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 79mkdir $RANDOM_MAPS;
73 80
74# a special map that is always available 81# a special map that is always available
75our $LINK_MAP; 82our $LINK_MAP;
76 83our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 84
79############################################################################# 85#############################################################################
80 86
81=head2 GLOBAL VARIABLES 87=head2 GLOBAL VARIABLES
82 88
106 112
107=item %cf::CFG 113=item %cf::CFG
108 114
109Configuration for the server, loaded from C</etc/crossfire/config>, or 115Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 116from wherever your confdir points to.
117
118=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
119
120These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
121or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
122processing has been done. Call C<< ->wait >> on them to maximise the
123window of cpu time available, or simply to synchronise to the server tick.
111 124
112=back 125=back
113 126
114=cut 127=cut
115 128
119 utf8::encode $msg; 132 utf8::encode $msg;
120 133
121 $msg .= "\n" 134 $msg .= "\n"
122 unless $msg =~ /\n$/; 135 unless $msg =~ /\n$/;
123 136
124 LOG llevError, "cfperl: $msg"; 137 LOG llevError, $msg;
125 }; 138 };
126} 139}
127 140
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 141@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 142@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
147 160
148$Event::DIED = sub { 161$Event::DIED = sub {
149 warn "error in event callback: @_"; 162 warn "error in event callback: @_";
150}; 163};
151 164
152my %ext_pkg;
153my @exts;
154my @hook;
155
156=head2 UTILITY FUNCTIONS 165=head2 UTILITY FUNCTIONS
157 166
158=over 4 167=over 4
159 168
169=item dumpval $ref
170
160=cut 171=cut
172
173sub dumpval {
174 eval {
175 local $SIG{__DIE__};
176 my $d;
177 if (1) {
178 $d = new Data::Dumper([$_[0]], ["*var"]);
179 $d->Terse(1);
180 $d->Indent(2);
181 $d->Quotekeys(0);
182 $d->Useqq(1);
183 #$d->Bless(...);
184 $d->Seen($_[1]) if @_ > 1;
185 $d = $d->Dump();
186 }
187 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
188 $d
189 } || "[unable to dump $_[0]: '$@']";
190}
161 191
162use JSON::Syck (); # TODO# replace by JSON::PC once working 192use JSON::Syck (); # TODO# replace by JSON::PC once working
163 193
164=item $ref = cf::from_json $json 194=item $ref = cf::from_json $json
165 195
180 210
181sub to_json($) { 211sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 212 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 213 JSON::Syck::Dump $_[0]
184} 214}
215
216=item cf::lock_wait $string
217
218Wait until the given lock is available. See cf::lock_acquire.
219
220=item my $lock = cf::lock_acquire $string
221
222Wait until the given lock is available and then acquires it and returns
223a Coro::guard object. If the guard object gets destroyed (goes out of scope,
224for example when the coroutine gets canceled), the lock is automatically
225returned.
226
227Lock names should begin with a unique identifier (for example, cf::map::find
228uses map_find and cf::map::load uses map_load).
229
230=cut
231
232our %LOCK;
233
234sub lock_wait($) {
235 my ($key) = @_;
236
237 # wait for lock, if any
238 while ($LOCK{$key}) {
239 push @{ $LOCK{$key} }, $Coro::current;
240 Coro::schedule;
241 }
242}
243
244sub lock_acquire($) {
245 my ($key) = @_;
246
247 # wait, to be sure we are not locked
248 lock_wait $key;
249
250 $LOCK{$key} = [];
251
252 Coro::guard {
253 # wake up all waiters, to be on the safe side
254 $_->ready for @{ delete $LOCK{$key} };
255 }
256}
257
258sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active;
260
261 my $guard = Coro::guard { $TICK_WATCHER->start };
262 $TICK_WATCHER->stop;
263 $guard
264}
265
266=item cf::async { BLOCK }
267
268Currently the same as Coro::async_pool, meaning you cannot use
269C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
270thing you are allowed to do is call C<prio> on it.
271
272=cut
273
274BEGIN { *async = \&Coro::async_pool }
185 275
186=item cf::sync_job { BLOCK } 276=item cf::sync_job { BLOCK }
187 277
188The design of crossfire+ requires that the main coro ($Coro::main) is 278The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 279always able to handle events or runnable, as crossfire+ is only partly
203 # this is the main coro, too bad, we have to block 293 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 294 # till the operation succeeds, freezing the server :/
205 295
206 # TODO: use suspend/resume instead 296 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 297 # (but this is cancel-safe)
208 local $FREEZE = 1; 298 my $freeze_guard = freeze_mainloop;
209 299
210 my $busy = 1; 300 my $busy = 1;
211 my @res; 301 my @res;
212 302
213 (Coro::async { 303 (async {
214 @res = eval { $job->() }; 304 @res = eval { $job->() };
215 warn $@ if $@; 305 warn $@ if $@;
216 undef $busy; 306 undef $busy;
217 })->prio (Coro::PRIO_MAX); 307 })->prio (Coro::PRIO_MAX);
218 308
219 while ($busy) { 309 while ($busy) {
220 Coro::cede_notself; 310 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 311 }
223 312
224 wantarray ? @res : $res[0] 313 wantarray ? @res : $res[0]
225 } else { 314 } else {
226 # we are in another coroutine, how wonderful, everything just works 315 # we are in another coroutine, how wonderful, everything just works
227 316
228 $job->() 317 $job->()
229 } 318 }
230} 319}
231 320
232=item $coro = cf::coro { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
233 322
234Creates and returns a new coro. This coro is automcatially being canceled 323Like async, but this coro is automatically being canceled when the
235when the extension calling this is being unloaded. 324extension calling this is being unloaded.
236 325
237=cut 326=cut
238 327
239sub coro(&) { 328sub async_ext(&) {
240 my $cb = shift; 329 my $cb = shift;
241 330
242 my $coro; $coro = async { 331 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 332
249 $coro->on_destroy (sub { 333 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 334 delete $EXT_CORO{$coro+0};
251 }); 335 });
252 $EXT_CORO{$coro+0} = $coro; 336 $EXT_CORO{$coro+0} = $coro;
282 366
283############################################################################# 367#############################################################################
284 368
285package cf::path; 369package cf::path;
286 370
371use overload
372 '""' => \&as_string;
373
374# used to convert map paths into valid unix filenames by repalcing / by ∕
375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
287sub new { 383sub new {
288 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
289 385
290 $path = $path->as_string if ref $path; 386 return $path if ref $path;
291 387
292 my $self = bless { }, $class; 388 my $self = {};
293 389
294 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
295 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
296 # ?random/... random maps 392 # ?random/... random maps
297 # /! non-realised random map exit 393 # /! non-realised random map exit
298 # /... normal maps 394 # /... normal maps
299 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
300 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
301 397
398 $path =~ s/$PATH_SEP/\//go;
399
302 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
303 # fine as it is 401 # fine as it is
304 } elsif ($path =~ s{^\?random/}{}) {
305 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
306 $self->{random} = cf::from_json $data;
307 } else { 402 } else {
308 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
309 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
310 406
311 if (defined $1) { 407 if (defined $1) {
312 $self->{user} = $1; 408 $self->{user} = $1;
313 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
314 $self->{user} = $1; 410 $self->{user} = $1;
315 } else { 411 } else {
316 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
317 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
318 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
319 # already absolute 422 # already absolute
320 } else { 423 } else {
424 # relative
321 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
322 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
323 } 427 }
324 428
325 for ($path) { 429 for ($path) {
328 } 432 }
329 } 433 }
330 434
331 $self->{path} = $path; 435 $self->{path} = $path;
332 436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
333 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
334} 458}
335 459
336# the name / primary key / in-game path 460# the name / primary key / in-game path
337sub as_string { 461sub as_string {
338 my ($self) = @_; 462 my ($self) = @_;
339 463
340 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
341 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
342 : $self->{path} 466 : $self->{path}
343} 467}
344 468
345# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
346sub visible_name { 470sub visible_name {
347 my ($self) = @_; 471 &as_string
348
349# if (my $rmp = $self->{random}) {
350# # todo: be more intelligent about this
351# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
352# } else {
353 $self->as_string
354# }
355} 472}
356 473
357# escape the /'s in the path 474# escape the /'s in the path
358sub _escaped_path { 475sub _escaped_path {
359 # ∕ is U+2215
360 (my $path = $_[0]{path}) =~ s/\///g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
361 $path 478 $path
362} 479}
363 480
364# the original (read-only) location 481# the original (read-only) location
365sub load_path { 482sub load_path {
370 487
371# the temporary/swap location 488# the temporary/swap location
372sub save_path { 489sub save_path {
373 my ($self) = @_; 490 my ($self) = @_;
374 491
492 $self->{user_rel}
375 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path 493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
376 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
377 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
378} 495}
379 496
380# the unique path, might be eq to save_path 497# the unique path, undef == no special unique path
381sub uniq_path { 498sub uniq_path {
382 my ($self) = @_; 499 my ($self) = @_;
383 500
384 $self->{user_rel} || $self->{random} 501 $self->{user_rel} || $self->{ext}
385 ? undef 502 ? undef
386 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
387} 504}
388 505
389# return random map parameters, or undef 506sub customise_for {
390sub random_map_params {
391 my ($self) = @_; 507 my ($self, $map, $ob) = @_;
392 508
393 $self->{random} 509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
394} 514}
395 515
396# this is somewhat ugly, but style maps do need special treatment 516# this is somewhat ugly, but style maps do need special treatment
397sub is_style_map { 517sub is_style_map {
398 $_[0]{path} =~ m{^/styles/} 518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
399} 539}
400 540
401package cf; 541package cf;
402 542
403############################################################################# 543#############################################################################
817 (aio_load "$filename.pst", $av) >= 0 957 (aio_load "$filename.pst", $av) >= 0
818 or return; 958 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 959 $av = eval { (Storable::thaw $av)->{objs} };
820 } 960 }
821 961
962 warn sprintf "loading %s (%d)\n",
963 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 964 return ($data, $av);
823} 965}
824 966
825############################################################################# 967#############################################################################
826# command handling &c 968# command handling &c
851=cut 993=cut
852 994
853sub register_extcmd { 995sub register_extcmd {
854 my ($name, $cb) = @_; 996 my ($name, $cb) = @_;
855 997
856 my $caller = caller;
857 #warn "registering extcmd '$name' to '$caller'";
858
859 $EXTCMD{$name} = [$cb, $caller]; 998 $EXTCMD{$name} = $cb;
860} 999}
861 1000
862cf::player->attach ( 1001cf::player->attach (
863 on_command => sub { 1002 on_command => sub {
864 my ($pl, $name, $params) = @_; 1003 my ($pl, $name, $params) = @_;
877 1016
878 my $msg = eval { from_json $buf }; 1017 my $msg = eval { from_json $buf };
879 1018
880 if (ref $msg) { 1019 if (ref $msg) {
881 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1020 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
882 if (my %reply = $cb->[0]->($pl, $msg)) { 1021 if (my %reply = $cb->($pl, $msg)) {
883 $pl->ext_reply ($msg->{msgid}, %reply); 1022 $pl->ext_reply ($msg->{msgid}, %reply);
884 } 1023 }
885 } 1024 }
886 } else { 1025 } else {
887 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1026 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
889 1028
890 cf::override; 1029 cf::override;
891 }, 1030 },
892); 1031);
893 1032
894sub register {
895 my ($base, $pkg) = @_;
896
897 #TODO
898}
899
900sub load_extension { 1033sub load_extension {
901 my ($path) = @_; 1034 my ($path) = @_;
902 1035
903 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1036 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
904 my $base = $1; 1037 my $base = $1;
905 my $pkg = $1; 1038 my $pkg = $1;
906 $pkg =~ s/[^[:word:]]/_/g; 1039 $pkg =~ s/[^[:word:]]/_/g;
907 $pkg = "ext::$pkg"; 1040 $pkg = "ext::$pkg";
908 1041
909 warn "loading '$path' into '$pkg'\n"; 1042 warn "... loading '$path' into '$pkg'\n";
910 1043
911 open my $fh, "<:utf8", $path 1044 open my $fh, "<:utf8", $path
912 or die "$path: $!"; 1045 or die "$path: $!";
913 1046
914 my $source = 1047 my $source =
919 1052
920 eval $source 1053 eval $source
921 or die $@ ? "$path: $@\n" 1054 or die $@ ? "$path: $@\n"
922 : "extension disabled.\n"; 1055 : "extension disabled.\n";
923 1056
924 push @exts, $pkg; 1057 push @EXTS, $pkg;
925 $ext_pkg{$base} = $pkg;
926
927# no strict 'refs';
928# @{"$pkg\::ISA"} = ext::;
929
930 register $base, $pkg;
931}
932
933sub unload_extension {
934 my ($pkg) = @_;
935
936 warn "removing extension $pkg\n";
937
938 # remove hooks
939 #TODO
940# for my $idx (0 .. $#PLUGIN_EVENT) {
941# delete $hook[$idx]{$pkg};
942# }
943
944 # remove commands
945 for my $name (keys %COMMAND) {
946 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
947
948 if (@cb) {
949 $COMMAND{$name} = \@cb;
950 } else {
951 delete $COMMAND{$name};
952 }
953 }
954
955 # remove extcmds
956 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
957 delete $EXTCMD{$name};
958 }
959
960 if (my $cb = $pkg->can ("unload")) {
961 eval {
962 $cb->($pkg);
963 1
964 } or warn "$pkg unloaded, but with errors: $@";
965 }
966
967 Symbol::delete_package $pkg;
968} 1058}
969 1059
970sub load_extensions { 1060sub load_extensions {
971 for my $ext (<$LIBDIR/*.ext>) { 1061 for my $ext (<$LIBDIR/*.ext>) {
972 next unless -r $ext; 1062 next unless -r $ext;
990}; 1080};
991 1081
992cf::map->attach (prio => -10000, package => cf::mapsupport::); 1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
993 1083
994############################################################################# 1084#############################################################################
995# load/save perl data associated with player->ob objects
996
997sub all_objects(@) {
998 @_, map all_objects ($_->inv), @_
999}
1000
1001# TODO: compatibility cruft, remove when no longer needed
1002cf::player->attach (
1003 on_load => sub {
1004 my ($pl, $path) = @_;
1005
1006 for my $o (all_objects $pl->ob) {
1007 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1008 $o->set_ob_key_value ("_perl_data");
1009
1010 %$o = %{ Storable::thaw pack "H*", $value };
1011 }
1012 }
1013 },
1014);
1015
1016#############################################################################
1017 1085
1018=head2 CORE EXTENSIONS 1086=head2 CORE EXTENSIONS
1019 1087
1020Functions and methods that extend core crossfire objects. 1088Functions and methods that extend core crossfire objects.
1021 1089
1090=cut
1091
1092package cf::player;
1093
1094use Coro::AIO;
1095
1022=head3 cf::player 1096=head3 cf::player
1023 1097
1024=over 4 1098=over 4
1025 1099
1026=item cf::player::exists $login 1100=item cf::player::find $login
1027 1101
1028Returns true when the given account exists. 1102Returns the given player object, loading it if necessary (might block).
1029 1103
1030=cut 1104=cut
1031 1105
1032sub cf::player::exists($) { 1106sub playerdir($) {
1033 cf::player::find $_[0] 1107 cf::localdir
1034 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1108 . "/"
1109 . cf::playerdir
1110 . "/"
1111 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1112}
1113
1114sub path($) {
1115 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1116
1117 (playerdir $login) . "/$login.pl"
1118}
1119
1120sub find_active($) {
1121 $cf::PLAYER{$_[0]}
1122 and $cf::PLAYER{$_[0]}->active
1123 and $cf::PLAYER{$_[0]}
1124}
1125
1126sub exists($) {
1127 my ($login) = @_;
1128
1129 $cf::PLAYER{$login}
1130 or cf::sync_job { !aio_stat $login }
1131}
1132
1133sub find($) {
1134 return $cf::PLAYER{$_[0]} || do {
1135 my $login = $_[0];
1136
1137 my $guard = cf::lock_acquire "user_find:$login";
1138
1139 $cf::PLAYER{$_[0]} || do {
1140 my $pl = load_pl path $login
1141 or return;
1142 $cf::PLAYER{$login} = $pl
1143 }
1144 }
1145}
1146
1147sub save($) {
1148 my ($pl) = @_;
1149
1150 return if $pl->{deny_save};
1151
1152 my $path = path $pl;
1153 my $guard = cf::lock_acquire "user_save:$path";
1154
1155 return if $pl->{deny_save};
1156
1157 aio_mkdir playerdir $pl, 0770;
1158 $pl->{last_save} = $cf::RUNTIME;
1159
1160 $pl->save_pl ($path);
1161 Coro::cede;
1162}
1163
1164sub new($) {
1165 my ($login) = @_;
1166
1167 my $self = create;
1168
1169 $self->ob->name ($login);
1170 $self->{deny_save} = 1;
1171
1172 $cf::PLAYER{$login} = $self;
1173
1174 $self
1175}
1176
1177=item $pl->quit_character
1178
1179Nukes the player without looking back. If logged in, the connection will
1180be destroyed. May block for a long time.
1181
1182=cut
1183
1184sub quit_character {
1185 my ($pl) = @_;
1186
1187 $pl->{deny_save} = 1;
1188 $pl->password ("*"); # this should lock out the player until we nuked the dir
1189
1190 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1191 $pl->deactivate;
1192 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1193 $pl->ns->destroy if $pl->ns;
1194
1195 my $path = playerdir $pl;
1196 my $temp = "$path~$cf::RUNTIME~deleting~";
1197 aio_rename $path, $temp;
1198 delete $cf::PLAYER{$pl->ob->name};
1199 $pl->destroy;
1200 IO::AIO::aio_rmtree $temp;
1201}
1202
1203=item cf::player::list_logins
1204
1205Returns am arrayref of all valid playernames in the system, can take a
1206while and may block, so not sync_job-capable, ever.
1207
1208=cut
1209
1210sub list_logins {
1211 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1212 or return [];
1213
1214 my @logins;
1215
1216 for my $login (@$dirs) {
1217 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1218 aio_read $fh, 0, 512, my $buf, 0 or next;
1219 $buf !~ /^password -------------$/m or next; # official not-valid tag
1220
1221 utf8::decode $login;
1222 push @logins, $login;
1223 }
1224
1225 \@logins
1226}
1227
1228=item $player->maps
1229
1230Returns an arrayref of cf::path's of all maps that are private for this
1231player. May block.
1232
1233=cut
1234
1235sub maps($) {
1236 my ($pl) = @_;
1237
1238 my $files = aio_readdir playerdir $pl
1239 or return;
1240
1241 my @paths;
1242
1243 for (@$files) {
1244 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o;
1247
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 }
1250
1251 \@paths
1035} 1252}
1036 1253
1037=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1038 1255
1039Sends an ext reply to the player. 1256Sends an ext reply to the player.
1040 1257
1041=cut 1258=cut
1042 1259
1043sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1044 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1045 1262
1046 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1047 1264
1048 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1049} 1266}
1267
1268package cf;
1050 1269
1051=back 1270=back
1052 1271
1053 1272
1054=head3 cf::map 1273=head3 cf::map
1060package cf::map; 1279package cf::map;
1061 1280
1062use Fcntl; 1281use Fcntl;
1063use Coro::AIO; 1282use Coro::AIO;
1064 1283
1065our $MAX_RESET = 7200; 1284our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1285our $DEFAULT_RESET = 3000;
1067 1286
1068sub generate_random_map { 1287sub generate_random_map {
1069 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1070 1289
1071 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1072 cf::map::_create_random_map 1291 cf::map::_create_random_map (
1073 $path, 1292 $path,
1074 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1075 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1076 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1077 $rmp->{exit_on_final_map}, 1296 $rmp->{exit_on_final_map},
1079 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1080 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1081 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1082 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1301 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1083 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1084 (cf::region::find $rmp->{region}) 1303 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 )
1085} 1305}
1086 1306
1087# and all this just because we cannot iterate over 1307# and all this just because we cannot iterate over
1088# all maps in C++... 1308# all maps in C++...
1089sub change_all_map_light { 1309sub change_all_map_light {
1090 my ($change) = @_; 1310 my ($change) = @_;
1091 1311
1092 $_->change_map_light ($change) for values %cf::MAP; 1312 $_->change_map_light ($change)
1313 for grep $_->outdoor, values %cf::MAP;
1093} 1314}
1094 1315
1095sub try_load_header($) { 1316sub load_map_header($) {
1096 my ($path) = @_; 1317 my ($path) = @_;
1097 1318
1098 utf8::encode $path; 1319 utf8::encode $path;
1099 aio_open $path, O_RDONLY, 0 1320 aio_open $path, O_RDONLY, 0
1100 or return; 1321 or return;
1101 1322
1102 my $map = cf::map::new 1323 my $map = cf::map::new
1103 or return; 1324 or return;
1104 1325
1326 # for better error messages only, will be overwritten later
1327 $map->path ($path);
1328
1105 $map->load_header ($path) 1329 $map->load_header ($path)
1106 or return; 1330 or return;
1107 1331
1108 $map->{load_path} = $path; 1332 $map->{load_path} = $path;
1109 1333
1110 $map 1334 $map
1111} 1335}
1112 1336
1337sub find;
1113sub find_map { 1338sub find {
1114 my ($path, $origin) = @_; 1339 my ($path, $origin) = @_;
1115 1340
1116 #warn "find_map<$path,$origin>\n";#d# 1341 #warn "find<$path,$origin>\n";#d#
1117 1342
1118 $path = new cf::path $path, $origin && $origin->path; 1343 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1344 my $key = $path->as_string;
1120 1345
1346 cf::lock_wait "map_find:$key";
1347
1121 $cf::MAP{$key} || do { 1348 $cf::MAP{$key} || do {
1349 my $guard = cf::lock_acquire "map_find:$key";
1350
1122 # do it the slow way 1351 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1124 1355
1125 if ($map) { 1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1126 # safety 1359 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1360 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1361 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1362 } else {
1130 if (my $rmp = $path->random_map_params) { 1363 $map = $path->load_orig
1131 $map = generate_random_map $key, $rmp;
1132 } else {
1133 $map = try_load_header $path->load_path;
1134 }
1135
1136 $map or return; 1364 or return;
1137 1365
1138 $map->{load_original} = 1; 1366 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1369 $map->instantiate;
1141 1370
1142 # per-player maps become, after loading, normal maps 1371 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1372 $map->per_player (0) if $path->{user_rel};
1144 } 1373 }
1145 1374
1146 $map->path ($key); 1375 $map->path ($key);
1147 $map->{path} = $path; 1376 $map->{path} = $path;
1148 $map->last_access ($cf::RUNTIME); 1377 $map->{last_save} = $cf::RUNTIME;
1378
1379 Coro::cede;
1149 1380
1150 if ($map->should_reset) { 1381 if ($map->should_reset) {
1151 $map->reset; 1382 $map->reset;
1383 undef $guard;
1152 $map = find_map $path; 1384 $map = find $path
1385 or return;
1153 } 1386 }
1154 1387
1155 $cf::MAP{$key} = $map 1388 $cf::MAP{$key} = $map
1156 } 1389 }
1157} 1390}
1158 1391
1159sub load { 1392sub load {
1160 my ($self) = @_; 1393 my ($self) = @_;
1161 1394
1395 my $path = $self->{path};
1396 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1397
1162 return if $self->in_memory != cf::MAP_SWAPPED; 1398 return if $self->in_memory != cf::MAP_SWAPPED;
1163 1399
1164 $self->in_memory (cf::MAP_LOADING); 1400 $self->in_memory (cf::MAP_LOADING);
1165
1166 my $path = $self->{path};
1167 1401
1168 $self->alloc; 1402 $self->alloc;
1169 $self->load_objects ($self->{load_path}, 1) 1403 $self->load_objects ($self->{load_path}, 1)
1170 or return; 1404 or return;
1171 1405
1178 $self->clear_unique_items; 1412 $self->clear_unique_items;
1179 $self->load_objects ($uniq, 0); 1413 $self->load_objects ($uniq, 0);
1180 } 1414 }
1181 } 1415 }
1182 1416
1417 Coro::cede;
1418
1183 # now do the right thing for maps 1419 # now do the right thing for maps
1184 $self->link_multipart_objects; 1420 $self->link_multipart_objects;
1185 1421
1186 if ($self->{path}->is_style_map) { 1422 if ($self->{path}->is_style_map) {
1187 $self->{deny_save} = 1; 1423 $self->{deny_save} = 1;
1188 $self->{deny_reset} = 1; 1424 $self->{deny_reset} = 1;
1189 } else { 1425 } else {
1426 $self->decay_objects;
1190 $self->fix_auto_apply; 1427 $self->fix_auto_apply;
1191 $self->decay_objects;
1192 $self->update_buttons; 1428 $self->update_buttons;
1193 $self->set_darkness_map; 1429 $self->set_darkness_map;
1194 $self->difficulty ($self->estimate_difficulty) 1430 $self->difficulty ($self->estimate_difficulty)
1195 unless $self->difficulty; 1431 unless $self->difficulty;
1196 $self->activate; 1432 $self->activate;
1197 } 1433 }
1198 1434
1435 Coro::cede;
1436
1199 $self->in_memory (cf::MAP_IN_MEMORY); 1437 $self->in_memory (cf::MAP_IN_MEMORY);
1200} 1438}
1201 1439
1202sub load_map_sync { 1440# find and load all maps in the 3x3 area around a map
1441sub load_diag {
1442 my ($map) = @_;
1443
1444 my @diag; # diagonal neighbours
1445
1446 for (0 .. 3) {
1447 my $neigh = $map->tile_path ($_)
1448 or next;
1449 $neigh = find $neigh, $map
1450 or next;
1451 $neigh->load;
1452
1453 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1454 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1455 }
1456
1457 for (@diag) {
1458 my $neigh = find @$_
1459 or next;
1460 $neigh->load;
1461 }
1462}
1463
1464sub find_sync {
1203 my ($path, $origin) = @_; 1465 my ($path, $origin) = @_;
1204 1466
1205 #warn "load_map_sync<$path, $origin>\n";#d# 1467 cf::sync_job { find $path, $origin }
1468}
1206 1469
1207 cf::sync_job { 1470sub do_load_sync {
1208 my $map = cf::map::find_map $path, $origin 1471 my ($map) = @_;
1472
1473 cf::sync_job { $map->load };
1474}
1475
1476our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async {
1478 while () {
1479 while (%MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1209 or return; 1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1210 $map->load; 1486 $map->load;
1211 $map 1487 }
1488 Coro::schedule;
1212 } 1489 }
1490};
1491
1492sub find_async {
1493 my ($path, $origin) = @_;
1494
1495 $path = new cf::path $path, $origin && $origin->path;
1496 my $key = $path->as_string;
1497
1498 if (my $map = $cf::MAP{$key}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 }
1501
1502 $MAP_PREFETCH{$key} = $path;
1503 $MAP_PREFETCHER->ready;
1504
1505 ()
1213} 1506}
1214 1507
1215sub save { 1508sub save {
1216 my ($self) = @_; 1509 my ($self) = @_;
1217 1510
1511 my $lock = cf::lock_acquire "map_data:" . $self->path;
1512
1513 $self->{last_save} = $cf::RUNTIME;
1514
1515 return unless $self->dirty;
1516
1218 my $save = $self->{path}->save_path; utf8::encode $save; 1517 my $save = $self->{path}->save_path; utf8::encode $save;
1219 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220 1519
1221 $self->{last_save} = $cf::RUNTIME;
1222
1223 return unless $self->dirty;
1224
1225 $self->{load_path} = $save; 1520 $self->{load_path} = $save;
1226 1521
1227 return if $self->{deny_save}; 1522 return if $self->{deny_save};
1523
1524 local $self->{last_access} = $self->last_access;#d#
1525
1526 cf::async {
1527 $_->contr->save for $self->players;
1528 };
1228 1529
1229 if ($uniq) { 1530 if ($uniq) {
1230 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1231 $self->save_objects ($uniq, cf::IO_UNIQUES); 1532 $self->save_objects ($uniq, cf::IO_UNIQUES);
1232 } else { 1533 } else {
1235} 1536}
1236 1537
1237sub swap_out { 1538sub swap_out {
1238 my ($self) = @_; 1539 my ($self) = @_;
1239 1540
1541 # save first because save cedes
1542 $self->save;
1543
1544 my $lock = cf::lock_acquire "map_data:" . $self->path;
1545
1240 return if $self->players; 1546 return if $self->players;
1241 return if $self->in_memory != cf::MAP_IN_MEMORY; 1547 return if $self->in_memory != cf::MAP_IN_MEMORY;
1242 return if $self->{deny_save}; 1548 return if $self->{deny_save};
1243 1549
1244 $self->save;
1245 $self->clear; 1550 $self->clear;
1246 $self->in_memory (cf::MAP_SWAPPED); 1551 $self->in_memory (cf::MAP_SWAPPED);
1247} 1552}
1248 1553
1249sub reset_at { 1554sub reset_at {
1263 my ($self) = @_; 1568 my ($self) = @_;
1264 1569
1265 $self->reset_at <= $cf::RUNTIME 1570 $self->reset_at <= $cf::RUNTIME
1266} 1571}
1267 1572
1268sub unlink_save {
1269 my ($self) = @_;
1270
1271 utf8::encode (my $save = $self->{path}->save_path);
1272 aioreq_pri 3; IO::AIO::aio_unlink $save;
1273 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1274}
1275
1276sub rename { 1573sub rename {
1277 my ($self, $new_path) = @_; 1574 my ($self, $new_path) = @_;
1278 1575
1279 $self->unlink_save; 1576 $self->{path}->unlink_save;
1280 1577
1281 delete $cf::MAP{$self->path}; 1578 delete $cf::MAP{$self->path};
1282 $self->{path} = new cf::path $new_path; 1579 $self->{path} = new cf::path $new_path;
1283 $self->path ($self->{path}->as_string); 1580 $self->path ($self->{path}->as_string);
1284 $cf::MAP{$self->path} = $self; 1581 $cf::MAP{$self->path} = $self;
1287} 1584}
1288 1585
1289sub reset { 1586sub reset {
1290 my ($self) = @_; 1587 my ($self) = @_;
1291 1588
1589 my $lock = cf::lock_acquire "map_data:" . $self->path;
1590
1292 return if $self->players; 1591 return if $self->players;
1293 return if $self->{path}{user_rel};#d# 1592 return if $self->{path}{user_rel};#d#
1294 1593
1295 warn "resetting map ", $self->path;#d# 1594 warn "resetting map ", $self->path;#d#
1296 1595
1297 delete $cf::MAP{$self->path}; 1596 delete $cf::MAP{$self->path};
1298 1597
1299 $_->clear_links_to ($self) for values %cf::MAP; 1598 $_->clear_links_to ($self) for values %cf::MAP;
1300 1599
1301 $self->unlink_save; 1600 $self->{path}->unlink_save;
1302 $self->destroy; 1601 $self->destroy;
1303} 1602}
1304 1603
1305my $nuke_counter = "aaaa"; 1604my $nuke_counter = "aaaa";
1306 1605
1311 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1312 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->rename ("{nuke}/" . ($nuke_counter++));
1313 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1314} 1613}
1315 1614
1316sub customise_for { 1615=item cf::map::unique_maps
1317 my ($map, $ob) = @_;
1318 1616
1319 if ($map->per_player) { 1617Returns an arrayref of cf::path's of all shared maps that have
1320 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1618instantiated unique items. May block.
1321 }
1322 1619
1323 $map 1620=cut
1324}
1325 1621
1326sub emergency_save { 1622sub unique_maps() {
1327 local $cf::FREEZE = 1; 1623 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1624 or return;
1328 1625
1329 warn "enter emergency map save\n"; 1626 my @paths;
1330 1627
1331 cf::sync_job { 1628 for (@$files) {
1332 warn "begin emergency map save\n"; 1629 utf8::decode $_;
1333 $_->save for values %cf::MAP; 1630 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o;
1632
1633 push @paths, new cf::path $_;
1334 }; 1634 }
1335 1635
1336 warn "end emergency map save\n"; 1636 \@paths
1337} 1637}
1338 1638
1339package cf; 1639package cf;
1340 1640
1341=back 1641=back
1342 1642
1643=head3 cf::object
1644
1645=cut
1646
1647package cf::object;
1648
1649=over 4
1650
1651=item $ob->inv_recursive
1652
1653Returns the inventory of the object _and_ their inventories, recursively.
1654
1655=cut
1656
1657sub inv_recursive_;
1658sub inv_recursive_ {
1659 map { $_, inv_recursive_ $_->inv } @_
1660}
1661
1662sub inv_recursive {
1663 inv_recursive_ inv $_[0]
1664}
1665
1666package cf;
1667
1668=back
1343 1669
1344=head3 cf::object::player 1670=head3 cf::object::player
1345 1671
1346=over 4 1672=over 4
1347 1673
1404=cut 1730=cut
1405 1731
1406sub cf::object::player::enter_link { 1732sub cf::object::player::enter_link {
1407 my ($self) = @_; 1733 my ($self) = @_;
1408 1734
1735 $self->deactivate_recursive;
1736
1409 return if $self->map == $LINK_MAP; 1737 return if $self->map == $LINK_MAP;
1410 1738
1411 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1739 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1412 if $self->map; 1740 if $self->map;
1413 1741
1414 $self->enter_map ($LINK_MAP, 20, 20); 1742 $self->enter_map ($LINK_MAP, 20, 20);
1415 $self->deactivate_recursive;
1416} 1743}
1417 1744
1418sub cf::object::player::leave_link { 1745sub cf::object::player::leave_link {
1419 my ($self, $map, $x, $y) = @_; 1746 my ($self, $map, $x, $y) = @_;
1420 1747
1421 my $link_pos = delete $self->{_link_pos}; 1748 my $link_pos = delete $self->{_link_pos};
1422 1749
1423 unless ($map) { 1750 unless ($map) {
1424 # restore original map position 1751 # restore original map position
1425 ($map, $x, $y) = @{ $link_pos || [] }; 1752 ($map, $x, $y) = @{ $link_pos || [] };
1426 $map = cf::map::find_map $map; 1753 $map = cf::map::find $map;
1427 1754
1428 unless ($map) { 1755 unless ($map) {
1429 ($map, $x, $y) = @$EMERGENCY_POSITION; 1756 ($map, $x, $y) = @$EMERGENCY_POSITION;
1430 $map = cf::map::find_map $map 1757 $map = cf::map::find $map
1431 or die "FATAL: cannot load emergency map\n"; 1758 or die "FATAL: cannot load emergency map\n";
1432 } 1759 }
1433 } 1760 }
1434 1761
1435 ($x, $y) = (-1, -1) 1762 ($x, $y) = (-1, -1)
1438 # use -1 or undef as default coordinates, not 0, 0 1765 # use -1 or undef as default coordinates, not 0, 0
1439 ($x, $y) = ($map->enter_x, $map->enter_y) 1766 ($x, $y) = ($map->enter_x, $map->enter_y)
1440 if $x <=0 && $y <= 0; 1767 if $x <=0 && $y <= 0;
1441 1768
1442 $map->load; 1769 $map->load;
1770 $map->load_diag;
1443 1771
1772 return unless $self->contr->active;
1444 $self->activate_recursive; 1773 $self->activate_recursive;
1445 $self->enter_map ($map, $x, $y); 1774 $self->enter_map ($map, $x, $y);
1446} 1775}
1447 1776
1777cf::player->attach (
1778 on_logout => sub {
1779 my ($pl) = @_;
1780
1781 # abort map switching before logout
1782 if ($pl->ob->{_link_pos}) {
1783 cf::sync_job {
1784 $pl->ob->leave_link
1785 };
1786 }
1787 },
1788 on_login => sub {
1789 my ($pl) = @_;
1790
1791 # try to abort aborted map switching on player login :)
1792 # should happen only on crashes
1793 if ($pl->ob->{_link_pos}) {
1794 $pl->ob->enter_link;
1795 (async {
1796 # we need this sleep as the login has a concurrent enter_exit running
1797 # and this sleep increases chances of the player not ending up in scorn
1798 $pl->ob->reply (undef,
1799 "There was an internal problem at your last logout, "
1800 . "the server will try to bring you to your intended destination in a second.",
1801 cf::NDI_RED);
1802 Coro::Timer::sleep 1;
1803 $pl->ob->leave_link;
1804 })->prio (2);
1805 }
1806 },
1807);
1808
1448=item $player_object->goto_map ($map, $x, $y) 1809=item $player_object->goto ($path, $x, $y)
1449 1810
1450=cut 1811=cut
1451 1812
1452sub cf::object::player::goto_map { 1813sub cf::object::player::goto {
1453 my ($self, $path, $x, $y) = @_; 1814 my ($self, $path, $x, $y) = @_;
1454 1815
1816 $path = new cf::path $path;
1817
1455 $self->enter_link; 1818 $self->enter_link;
1456 1819
1457 (Coro::async { 1820 (async {
1458 $path = new cf::path $path;
1459
1460 my $map = cf::map::find_map $path->as_string; 1821 my $map = cf::map::find $path->as_string;
1461 $map = $map->customise_for ($self) if $map; 1822 $map = $map->{path}->customise_for ($map, $self) if $map;
1462 1823
1463 warn "entering ", $map->path, " at ($x, $y)\n" 1824# warn "entering ", $map->path, " at ($x, $y)\n"
1464 if $map; 1825# if $map;
1465 1826
1466 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1467 1828
1468 $self->leave_link ($map, $x, $y); 1829 $self->leave_link ($map, $x, $y);
1469 })->prio (1); 1830 })->prio (1);
1470} 1831}
1471 1832
1524 1885
1525 return unless $self->type == cf::PLAYER; 1886 return unless $self->type == cf::PLAYER;
1526 1887
1527 $self->enter_link; 1888 $self->enter_link;
1528 1889
1529 (Coro::async { 1890 (async {
1891 $self->deactivate_recursive; # just to be sure
1530 unless (eval { 1892 unless (eval {
1531
1532 prepare_random_map $exit 1893 prepare_random_map $exit
1533 if $exit->slaying eq "/!"; 1894 if $exit->slaying eq "/!";
1534 1895
1535 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1536 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1537 1898
1538 1; 1899 1;
1539 }) { 1900 }) {
1540 $self->message ("Something went wrong deep within the crossfire server. " 1901 $self->message ("Something went wrong deep within the crossfire server. "
1541 . "I'll try to bring you back to the map you were before. " 1902 . "I'll try to bring you back to the map you were before. "
1542 . "Please report this to the dungeon master", 1903 . "Please report this to the dungeon master!",
1543 cf::NDI_UNIQUE | cf::NDI_RED); 1904 cf::NDI_UNIQUE | cf::NDI_RED);
1544 1905
1545 warn "ERROR in enter_exit: $@"; 1906 warn "ERROR in enter_exit: $@";
1546 $self->leave_link; 1907 $self->leave_link;
1547 } 1908 }
1598 on_reply => sub { 1959 on_reply => sub {
1599 my ($ns, $msg) = @_; 1960 my ($ns, $msg) = @_;
1600 1961
1601 # this weird shuffling is so that direct followup queries 1962 # this weird shuffling is so that direct followup queries
1602 # get handled first 1963 # get handled first
1603 my $queue = delete $ns->{query_queue}; 1964 my $queue = delete $ns->{query_queue}
1965 or return; # be conservative, not sure how that can happen, but we saw a crash here
1604 1966
1605 (shift @$queue)->[1]->($msg); 1967 (shift @$queue)->[1]->($msg);
1606 1968
1607 push @{ $ns->{query_queue} }, @$queue; 1969 push @{ $ns->{query_queue} }, @$queue;
1608 1970
1614 } 1976 }
1615 } 1977 }
1616 }, 1978 },
1617); 1979);
1618 1980
1619=item $client->coro (\&cb) 1981=item $client->async (\&cb)
1620 1982
1621Create a new coroutine, running the specified callback. The coroutine will 1983Create a new coroutine, running the specified callback. The coroutine will
1622be automatically cancelled when the client gets destroyed (e.g. on logout, 1984be automatically cancelled when the client gets destroyed (e.g. on logout,
1623or loss of connection). 1985or loss of connection).
1624 1986
1625=cut 1987=cut
1626 1988
1627sub cf::client::coro { 1989sub cf::client::async {
1628 my ($self, $cb) = @_; 1990 my ($self, $cb) = @_;
1629 1991
1630 my $coro; $coro = async { 1992 my $coro = &Coro::async ($cb);
1631 eval {
1632 $cb->();
1633 };
1634 warn $@ if $@;
1635 };
1636 1993
1637 $coro->on_destroy (sub { 1994 $coro->on_destroy (sub {
1638 delete $self->{_coro}{$coro+0}; 1995 delete $self->{_coro}{$coro+0};
1639 }); 1996 });
1640 1997
1812 2169
1813{ 2170{
1814 my $path = cf::localdir . "/database.pst"; 2171 my $path = cf::localdir . "/database.pst";
1815 2172
1816 sub db_load() { 2173 sub db_load() {
1817 warn "loading database $path\n";#d# remove later
1818 $DB = stat $path ? Storable::retrieve $path : { }; 2174 $DB = stat $path ? Storable::retrieve $path : { };
1819 } 2175 }
1820 2176
1821 my $pid; 2177 my $pid;
1822 2178
1823 sub db_save() { 2179 sub db_save() {
1824 warn "saving database $path\n";#d# remove later
1825 waitpid $pid, 0 if $pid; 2180 waitpid $pid, 0 if $pid;
1826 if (0 == ($pid = fork)) { 2181 if (0 == ($pid = fork)) {
1827 $DB->{_meta}{version} = 1; 2182 $DB->{_meta}{version} = 1;
1828 Storable::nstore $DB, "$path~"; 2183 Storable::nstore $DB, "$path~";
1829 rename "$path~", $path; 2184 rename "$path~", $path;
1877 open my $fh, "<:utf8", cf::confdir . "/config" 2232 open my $fh, "<:utf8", cf::confdir . "/config"
1878 or return; 2233 or return;
1879 2234
1880 local $/; 2235 local $/;
1881 *CFG = YAML::Syck::Load <$fh>; 2236 *CFG = YAML::Syck::Load <$fh>;
2237
2238 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2239
2240 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2241 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2242
2243 if (exists $CFG{mlockall}) {
2244 eval {
2245 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2246 and die "WARNING: m(un)lockall failed: $!\n";
2247 };
2248 warn $@ if $@;
2249 }
1882} 2250}
1883 2251
1884sub main { 2252sub main {
1885 # we must not ever block the main coroutine 2253 # we must not ever block the main coroutine
1886 local $Coro::idle = sub { 2254 local $Coro::idle = sub {
1887 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2255 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1888 (Coro::unblock_sub {
1889 Event::one_event; 2256 async { Event::one_event };
1890 })->();
1891 }; 2257 };
1892 2258
1893 cfg_load; 2259 cfg_load;
1894 db_load; 2260 db_load;
1895 load_extensions; 2261 load_extensions;
1896 Event::loop; 2262 Event::loop;
1897} 2263}
1898 2264
1899############################################################################# 2265#############################################################################
1900# initialisation 2266# initialisation and cleanup
2267
2268# install some emergency cleanup handlers
2269BEGIN {
2270 for my $signal (qw(INT HUP TERM)) {
2271 Event->signal (
2272 data => WF_AUTOCANCEL,
2273 signal => $signal,
2274 cb => sub {
2275 cf::cleanup "SIG$signal";
2276 },
2277 );
2278 }
2279}
2280
2281sub emergency_save() {
2282 my $freeze_guard = cf::freeze_mainloop;
2283
2284 warn "enter emergency perl save\n";
2285
2286 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously.
2290 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next;
2294 $pl->save;
2295 }
2296 warn "end emergency player save\n";
2297
2298 warn "begin emergency map save\n";
2299 for my $path (keys %cf::MAP) {
2300 my $map = $cf::MAP{$path} or next;
2301 $map->valid or next;
2302 $map->save;
2303 }
2304 warn "end emergency map save\n";
2305 };
2306
2307 warn "leave emergency perl save\n";
2308}
1901 2309
1902sub reload() { 2310sub reload() {
1903 # can/must only be called in main 2311 # can/must only be called in main
1904 if ($Coro::current != $Coro::main) { 2312 if ($Coro::current != $Coro::main) {
1905 warn "can only reload from main coroutine\n"; 2313 warn "can only reload from main coroutine\n";
1906 return; 2314 return;
1907 } 2315 }
1908 2316
1909 warn "reloading..."; 2317 warn "reloading...";
1910 2318
1911 local $FREEZE = 1; 2319 warn "freezing server";
2320 my $guard = freeze_mainloop;
1912 cf::emergency_save; 2321 cf::emergency_save;
2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
1913 2326
1914 eval { 2327 eval {
1915 # if anything goes wrong in here, we should simply crash as we already saved 2328 # if anything goes wrong in here, we should simply crash as we already saved
1916 2329
1917 # cancel all watchers 2330 warn "cancel all watchers";
1918 for (Event::all_watchers) { 2331 for (Event::all_watchers) {
1919 $_->cancel if $_->data & WF_AUTOCANCEL; 2332 $_->cancel if $_->data & WF_AUTOCANCEL;
1920 } 2333 }
1921 2334
1922 # cancel all extension coros 2335 warn "cancel all extension coros";
1923 $_->cancel for values %EXT_CORO; 2336 $_->cancel for values %EXT_CORO;
1924 %EXT_CORO = (); 2337 %EXT_CORO = ();
1925 2338
2339 warn "remove commands";
2340 %COMMAND = ();
2341
2342 warn "remove ext commands";
2343 %EXTCMD = ();
2344
1926 # unload all extensions 2345 warn "unload/nuke all extensions";
1927 for (@exts) { 2346 for my $pkg (@EXTS) {
1928 warn "unloading <$_>"; 2347 warn "... unloading $pkg";
1929 unload_extension $_; 2348
2349 if (my $cb = $pkg->can ("unload")) {
2350 eval {
2351 $cb->($pkg);
2352 1
2353 } or warn "$pkg unloaded, but with errors: $@";
1930 } 2354 }
1931 2355
2356 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg;
2358 }
2359
1932 # unload all modules loaded from $LIBDIR 2360 warn "unload all perl modules loaded from $LIBDIR";
1933 while (my ($k, $v) = each %INC) { 2361 while (my ($k, $v) = each %INC) {
1934 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
1935 2363
1936 warn "removing <$k>"; 2364 warn "removing <$k>";
1937 delete $INC{$k}; 2365 delete $INC{$k};
1944 } 2372 }
1945 2373
1946 Symbol::delete_package $k; 2374 Symbol::delete_package $k;
1947 } 2375 }
1948 2376
1949 # sync database to disk
1950 cf::db_sync;
1951 IO::AIO::flush;
1952
1953 # get rid of safe::, as good as possible 2377 warn "get rid of safe::, as good as possible";
1954 Symbol::delete_package "safe::$_" 2378 Symbol::delete_package "safe::$_"
1955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2379 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
1956 2380
1957 # remove register_script_function callbacks
1958 # TODO
1959
1960 # unload cf.pm "a bit" 2381 warn "unload cf.pm \"a bit\"";
1961 delete $INC{"cf.pm"}; 2382 delete $INC{"cf.pm"};
1962 2383
1963 # don't, removes xs symbols, too, 2384 # don't, removes xs symbols, too,
1964 # and global variables created in xs 2385 # and global variables created in xs
1965 #Symbol::delete_package __PACKAGE__; 2386 #Symbol::delete_package __PACKAGE__;
1966 2387
1967 # reload cf.pm
1968 warn "reloading cf.pm"; 2388 warn "reloading cf.pm";
1969 require cf; 2389 require cf;
1970 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1971 2391
1972 # load config and database again 2392 warn "load config and database again";
1973 cf::cfg_load; 2393 cf::cfg_load;
1974 cf::db_load; 2394 cf::db_load;
1975 2395
1976 # load extensions
1977 warn "load extensions"; 2396 warn "load extensions";
1978 cf::load_extensions; 2397 cf::load_extensions;
1979 2398
1980 # reattach attachments to objects 2399 warn "reattach attachments to objects/players";
1981 warn "reattach";
1982 _global_reattach; 2400 _global_reattach;
2401 warn "reattach attachments to maps";
2402 reattach $_ for values %MAP;
1983 }; 2403 };
1984 2404
1985 if ($@) { 2405 if ($@) {
1986 warn $@; 2406 warn $@;
1987 warn "error while reloading, exiting."; 2407 warn "error while reloading, exiting.";
1988 exit 1; 2408 exit 1;
1989 } 2409 }
1990 2410
1991 warn "reloaded successfully"; 2411 warn "reloaded";
1992}; 2412};
1993 2413
1994############################################################################# 2414#############################################################################
1995 2415
1996unless ($LINK_MAP) { 2416unless ($LINK_MAP) {
2003 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2004 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2005 2425
2006 # dirty hack because... archetypes are not yet loaded 2426 # dirty hack because... archetypes are not yet loaded
2007 Event->timer ( 2427 Event->timer (
2008 after => 2, 2428 after => 10,
2009 cb => sub { 2429 cb => sub {
2010 $_[0]->w->cancel; 2430 $_[0]->w->cancel;
2011 2431
2012 # provide some exits "home" 2432 # provide some exits "home"
2013 my $exit = cf::object::new "exit"; 2433 my $exit = cf::object::new "exit";
2032 $LINK_MAP->{deny_reset} = 1; 2452 $LINK_MAP->{deny_reset} = 1;
2033 2453
2034 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2035} 2455}
2036 2456
2037register "<global>", __PACKAGE__;
2038
2039register_command "reload" => sub { 2457register_command "reload" => sub {
2040 my ($who, $arg) = @_; 2458 my ($who, $arg) = @_;
2041 2459
2042 if ($who->flag (FLAG_WIZ)) { 2460 if ($who->flag (FLAG_WIZ)) {
2043 $who->message ("start of reload."); 2461 $who->message ("start of reload.");
2052 reentrant => 0, 2470 reentrant => 0,
2053 prio => 0, 2471 prio => 0,
2054 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2055 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2056 cb => sub { 2474 cb => sub {
2057 unless ($FREEZE) { 2475 $NOW = Event::time;
2476
2058 cf::server_tick; # one server iteration 2477 cf::server_tick; # one server iteration
2059 $RUNTIME += $TICK; 2478 $RUNTIME += $TICK;
2060 }
2061
2062 $NEXT_TICK += $TICK; 2479 $NEXT_TICK += $TICK;
2480
2481 $WAIT_FOR_TICK->broadcast;
2482 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2063 2483
2064 # if we are delayed by four ticks or more, skip them all 2484 # if we are delayed by four ticks or more, skip them all
2065 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2066 2486
2067 $TICK_WATCHER->at ($NEXT_TICK); 2487 $TICK_WATCHER->at ($NEXT_TICK);
2089 or warn "ERROR: unable to write runtime file: $!"; 2509 or warn "ERROR: unable to write runtime file: $!";
2090 })->(); 2510 })->();
2091 }, 2511 },
2092); 2512);
2093 2513
2514END { cf::emergency_save }
2515
20941 25161
2095 2517

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines