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.129 by root, Wed Jan 3 00:41:19 2007 UTC vs.
Revision 1.165 by root, Fri Jan 12 22:09:22 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;
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
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}
185 215
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 216=item cf::lock_wait $string
209 217
210Wait until the given lock is available. See cf::lock_acquire. 218Wait until the given lock is available. See cf::lock_acquire.
211 219
212=item my $lock = cf::lock_acquire $string 220=item my $lock = cf::lock_acquire $string
213 221
214Wait until the given lock is available and then acquires it and returns 222Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 223a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 224for example when the coroutine gets canceled), the lock is automatically
217returned. 225returned.
218 226
219Lock names should begin with a unique identifier (for example, find_map 227Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 228uses map_find and cf::map::load uses map_load).
221 229
222=cut 230=cut
223 231
224our %LOCK; 232our %LOCK;
225 233
239 # wait, to be sure we are not locked 247 # wait, to be sure we are not locked
240 lock_wait $key; 248 lock_wait $key;
241 249
242 $LOCK{$key} = []; 250 $LOCK{$key} = [];
243 251
244 cf::guard { 252 Coro::guard {
245 # wake up all waiters, to be on the safe side 253 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 254 $_->ready for @{ delete $LOCK{$key} };
247 } 255 }
248} 256}
249 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
250=item cf::async { BLOCK } 266=item cf::async { BLOCK }
251 267
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 268Currently the same as Coro::async_pool, meaning you cannot use
253error instead of exiting the server in case of a problem. 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.
254 271
255=cut 272=cut
256 273
257sub async(&) { 274BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 275
266=item cf::sync_job { BLOCK } 276=item cf::sync_job { BLOCK }
267 277
268The design of crossfire+ requires that the main coro ($Coro::main) is 278The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 279always able to handle events or runnable, as crossfire+ is only partly
283 # this is the main coro, too bad, we have to block 293 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 294 # till the operation succeeds, freezing the server :/
285 295
286 # TODO: use suspend/resume instead 296 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 297 # (but this is cancel-safe)
288 local $FREEZE = 1; 298 my $freeze_guard = freeze_mainloop;
289 299
290 my $busy = 1; 300 my $busy = 1;
291 my @res; 301 my @res;
292 302
293 (Coro::async { 303 (async {
294 @res = eval { $job->() }; 304 @res = eval { $job->() };
295 warn $@ if $@; 305 warn $@ if $@;
296 undef $busy; 306 undef $busy;
297 })->prio (Coro::PRIO_MAX); 307 })->prio (Coro::PRIO_MAX);
298 308
299 while ($busy) { 309 while ($busy) {
300 Coro::cede_notself; 310 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 311 }
303 312
304 wantarray ? @res : $res[0] 313 wantarray ? @res : $res[0]
305 } else { 314 } else {
306 # we are in another coroutine, how wonderful, everything just works 315 # we are in another coroutine, how wonderful, everything just works
307 316
308 $job->() 317 $job->()
309 } 318 }
310} 319}
311 320
312=item $coro = cf::coro { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
313 322
314Creates and returns a new coro. This coro is automcatially being canceled 323Like async, but this coro is automatically being canceled when the
315when the extension calling this is being unloaded. 324extension calling this is being unloaded.
316 325
317=cut 326=cut
318 327
319sub coro(&) { 328sub async_ext(&) {
320 my $cb = shift; 329 my $cb = shift;
321 330
322 my $coro = &cf::async ($cb); 331 my $coro = &Coro::async ($cb);
323 332
324 $coro->on_destroy (sub { 333 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 334 delete $EXT_CORO{$coro+0};
326 }); 335 });
327 $EXT_CORO{$coro+0} = $coro; 336 $EXT_CORO{$coro+0} = $coro;
357 366
358############################################################################# 367#############################################################################
359 368
360package cf::path; 369package cf::path;
361 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
362sub new { 383sub new {
363 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
364 385
365 $path = $path->as_string if ref $path; 386 return $path if ref $path;
366 387
367 my $self = bless { }, $class; 388 my $self = {};
368 389
369 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
370 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
371 # ?random/... random maps 392 # ?random/... random maps
372 # /! non-realised random map exit 393 # /! non-realised random map exit
373 # /... normal maps 394 # /... normal maps
374 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
375 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
376 397
398 $path =~ s/$PATH_SEP/\//go;
399
377 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
378 # fine as it is 401 # fine as it is
379 } elsif ($path =~ s{^\?random/}{}) {
380 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
381 $self->{random} = cf::from_json $data;
382 } else { 402 } else {
383 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
384 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
385 406
386 if (defined $1) { 407 if (defined $1) {
387 $self->{user} = $1; 408 $self->{user} = $1;
388 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
389 $self->{user} = $1; 410 $self->{user} = $1;
390 } else { 411 } else {
391 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
392 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
393 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
394 # already absolute 422 # already absolute
395 } else { 423 } else {
424 # relative
396 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
397 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
398 } 427 }
399 428
400 for ($path) { 429 for ($path) {
403 } 432 }
404 } 433 }
405 434
406 $self->{path} = $path; 435 $self->{path} = $path;
407 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
408 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
409} 458}
410 459
411# the name / primary key / in-game path 460# the name / primary key / in-game path
412sub as_string { 461sub as_string {
413 my ($self) = @_; 462 my ($self) = @_;
414 463
415 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
416 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
417 : $self->{path} 466 : $self->{path}
418} 467}
419 468
420# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
421sub visible_name { 470sub visible_name {
422 my ($self) = @_; 471 &as_string
423
424# if (my $rmp = $self->{random}) {
425# # todo: be more intelligent about this
426# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
427# } else {
428 $self->as_string
429# }
430} 472}
431 473
432# escape the /'s in the path 474# escape the /'s in the path
433sub _escaped_path { 475sub _escaped_path {
434 # ∕ is U+2215
435 (my $path = $_[0]{path}) =~ s/\///g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
436 $path 478 $path
437} 479}
438 480
439# the original (read-only) location 481# the original (read-only) location
440sub load_path { 482sub load_path {
445 487
446# the temporary/swap location 488# the temporary/swap location
447sub save_path { 489sub save_path {
448 my ($self) = @_; 490 my ($self) = @_;
449 491
492 $self->{user_rel}
450 $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
451 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
452 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
453} 495}
454 496
455# the unique path, might be eq to save_path 497# the unique path, undef == no special unique path
456sub uniq_path { 498sub uniq_path {
457 my ($self) = @_; 499 my ($self) = @_;
458 500
459 $self->{user_rel} || $self->{random} 501 $self->{user_rel} || $self->{ext}
460 ? undef 502 ? undef
461 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
462} 504}
463 505
464# return random map parameters, or undef 506sub customise_for {
465sub random_map_params {
466 my ($self) = @_; 507 my ($self, $map, $ob) = @_;
467 508
468 $self->{random} 509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
469} 514}
470 515
471# this is somewhat ugly, but style maps do need special treatment 516# this is somewhat ugly, but style maps do need special treatment
472sub is_style_map { 517sub is_style_map {
473 $_[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";
474} 539}
475 540
476package cf; 541package cf;
477 542
478############################################################################# 543#############################################################################
928=cut 993=cut
929 994
930sub register_extcmd { 995sub register_extcmd {
931 my ($name, $cb) = @_; 996 my ($name, $cb) = @_;
932 997
933 my $caller = caller;
934 #warn "registering extcmd '$name' to '$caller'";
935
936 $EXTCMD{$name} = [$cb, $caller]; 998 $EXTCMD{$name} = $cb;
937} 999}
938 1000
939cf::player->attach ( 1001cf::player->attach (
940 on_command => sub { 1002 on_command => sub {
941 my ($pl, $name, $params) = @_; 1003 my ($pl, $name, $params) = @_;
954 1016
955 my $msg = eval { from_json $buf }; 1017 my $msg = eval { from_json $buf };
956 1018
957 if (ref $msg) { 1019 if (ref $msg) {
958 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1020 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
959 if (my %reply = $cb->[0]->($pl, $msg)) { 1021 if (my %reply = $cb->($pl, $msg)) {
960 $pl->ext_reply ($msg->{msgid}, %reply); 1022 $pl->ext_reply ($msg->{msgid}, %reply);
961 } 1023 }
962 } 1024 }
963 } else { 1025 } else {
964 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1026 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
966 1028
967 cf::override; 1029 cf::override;
968 }, 1030 },
969); 1031);
970 1032
971sub register {
972 my ($base, $pkg) = @_;
973
974 #TODO
975}
976
977sub load_extension { 1033sub load_extension {
978 my ($path) = @_; 1034 my ($path) = @_;
979 1035
980 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1036 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
981 my $base = $1; 1037 my $base = $1;
982 my $pkg = $1; 1038 my $pkg = $1;
983 $pkg =~ s/[^[:word:]]/_/g; 1039 $pkg =~ s/[^[:word:]]/_/g;
984 $pkg = "ext::$pkg"; 1040 $pkg = "ext::$pkg";
985 1041
986 warn "loading '$path' into '$pkg'\n"; 1042 warn "... loading '$path' into '$pkg'\n";
987 1043
988 open my $fh, "<:utf8", $path 1044 open my $fh, "<:utf8", $path
989 or die "$path: $!"; 1045 or die "$path: $!";
990 1046
991 my $source = 1047 my $source =
996 1052
997 eval $source 1053 eval $source
998 or die $@ ? "$path: $@\n" 1054 or die $@ ? "$path: $@\n"
999 : "extension disabled.\n"; 1055 : "extension disabled.\n";
1000 1056
1001 push @exts, $pkg; 1057 push @EXTS, $pkg;
1002 $ext_pkg{$base} = $pkg;
1003
1004# no strict 'refs';
1005# @{"$pkg\::ISA"} = ext::;
1006
1007 register $base, $pkg;
1008}
1009
1010sub unload_extension {
1011 my ($pkg) = @_;
1012
1013 warn "removing extension $pkg\n";
1014
1015 # remove hooks
1016 #TODO
1017# for my $idx (0 .. $#PLUGIN_EVENT) {
1018# delete $hook[$idx]{$pkg};
1019# }
1020
1021 # remove commands
1022 for my $name (keys %COMMAND) {
1023 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1024
1025 if (@cb) {
1026 $COMMAND{$name} = \@cb;
1027 } else {
1028 delete $COMMAND{$name};
1029 }
1030 }
1031
1032 # remove extcmds
1033 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1034 delete $EXTCMD{$name};
1035 }
1036
1037 if (my $cb = $pkg->can ("unload")) {
1038 eval {
1039 $cb->($pkg);
1040 1
1041 } or warn "$pkg unloaded, but with errors: $@";
1042 }
1043
1044 Symbol::delete_package $pkg;
1045} 1058}
1046 1059
1047sub load_extensions { 1060sub load_extensions {
1048 for my $ext (<$LIBDIR/*.ext>) { 1061 for my $ext (<$LIBDIR/*.ext>) {
1049 next unless -r $ext; 1062 next unless -r $ext;
1067}; 1080};
1068 1081
1069cf::map->attach (prio => -10000, package => cf::mapsupport::); 1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1070 1083
1071############################################################################# 1084#############################################################################
1072# load/save perl data associated with player->ob objects
1073
1074sub all_objects(@) {
1075 @_, map all_objects ($_->inv), @_
1076}
1077
1078# TODO: compatibility cruft, remove when no longer needed
1079cf::player->attach (
1080 on_load => sub {
1081 my ($pl, $path) = @_;
1082
1083 for my $o (all_objects $pl->ob) {
1084 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1085 $o->set_ob_key_value ("_perl_data");
1086
1087 %$o = %{ Storable::thaw pack "H*", $value };
1088 }
1089 }
1090 },
1091);
1092
1093#############################################################################
1094 1085
1095=head2 CORE EXTENSIONS 1086=head2 CORE EXTENSIONS
1096 1087
1097Functions and methods that extend core crossfire objects. 1088Functions and methods that extend core crossfire objects.
1098 1089
1090=cut
1091
1092package cf::player;
1093
1094use Coro::AIO;
1095
1099=head3 cf::player 1096=head3 cf::player
1100 1097
1101=over 4 1098=over 4
1102 1099
1103=item cf::player::exists $login 1100=item cf::player::find $login
1104 1101
1105Returns true when the given account exists. 1102Returns the given player object, loading it if necessary (might block).
1106 1103
1107=cut 1104=cut
1108 1105
1109sub cf::player::exists($) { 1106sub playerdir($) {
1110 cf::player::find $_[0] 1107 cf::localdir
1111 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
1112} 1252}
1113 1253
1114=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1115 1255
1116Sends an ext reply to the player. 1256Sends an ext reply to the player.
1117 1257
1118=cut 1258=cut
1119 1259
1120sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1121 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1122 1262
1123 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1124 1264
1125 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1126} 1266}
1267
1268package cf;
1127 1269
1128=back 1270=back
1129 1271
1130 1272
1131=head3 cf::map 1273=head3 cf::map
1137package cf::map; 1279package cf::map;
1138 1280
1139use Fcntl; 1281use Fcntl;
1140use Coro::AIO; 1282use Coro::AIO;
1141 1283
1142our $MAX_RESET = 7200; 1284our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1285our $DEFAULT_RESET = 3000;
1144 1286
1145sub generate_random_map { 1287sub generate_random_map {
1146 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1147 1289
1148 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1149 cf::map::_create_random_map 1291 cf::map::_create_random_map (
1150 $path, 1292 $path,
1151 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1152 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1153 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1154 $rmp->{exit_on_final_map}, 1296 $rmp->{exit_on_final_map},
1156 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1157 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1158 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1159 $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},
1160 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1161 (cf::region::find $rmp->{region}) 1303 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 )
1162} 1305}
1163 1306
1164# and all this just because we cannot iterate over 1307# and all this just because we cannot iterate over
1165# all maps in C++... 1308# all maps in C++...
1166sub change_all_map_light { 1309sub change_all_map_light {
1168 1311
1169 $_->change_map_light ($change) 1312 $_->change_map_light ($change)
1170 for grep $_->outdoor, values %cf::MAP; 1313 for grep $_->outdoor, values %cf::MAP;
1171} 1314}
1172 1315
1173sub try_load_header($) { 1316sub load_map_header($) {
1174 my ($path) = @_; 1317 my ($path) = @_;
1175 1318
1176 utf8::encode $path; 1319 utf8::encode $path;
1177 aio_open $path, O_RDONLY, 0 1320 aio_open $path, O_RDONLY, 0
1178 or return; 1321 or return;
1179 1322
1180 my $map = cf::map::new 1323 my $map = cf::map::new
1181 or return; 1324 or return;
1182 1325
1326 # for better error messages only, will be overwritten later
1327 $map->path ($path);
1328
1183 $map->load_header ($path) 1329 $map->load_header ($path)
1184 or return; 1330 or return;
1185 1331
1186 $map->{load_path} = $path; 1332 $map->{load_path} = $path;
1187 1333
1188 $map 1334 $map
1189} 1335}
1190 1336
1191sub find_map; 1337sub find;
1192sub find_map { 1338sub find {
1193 my ($path, $origin) = @_; 1339 my ($path, $origin) = @_;
1194 1340
1195 #warn "find_map<$path,$origin>\n";#d# 1341 #warn "find<$path,$origin>\n";#d#
1196 1342
1197 $path = new cf::path $path, $origin && $origin->path; 1343 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1344 my $key = $path->as_string;
1199 1345
1200 cf::lock_wait "map_find:$key"; 1346 cf::lock_wait "map_find:$key";
1201 1347
1202 $cf::MAP{$key} || do { 1348 $cf::MAP{$key} || do {
1203 my $guard = cf::lock_acquire "map_find:$key"; 1349 my $guard = cf::lock_acquire "map_find:$key";
1204 1350
1205 # do it the slow way 1351 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1207 1355
1208 if ($map) { 1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1209 # safety 1359 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1360 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1361 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1362 } else {
1213 if (my $rmp = $path->random_map_params) { 1363 $map = $path->load_orig
1214 $map = generate_random_map $key, $rmp;
1215 } else {
1216 $map = try_load_header $path->load_path;
1217 }
1218
1219 $map or return; 1364 or return;
1220 1365
1221 $map->{load_original} = 1; 1366 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1369 $map->instantiate;
1224 1370
1225 # per-player maps become, after loading, normal maps 1371 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1372 $map->per_player (0) if $path->{user_rel};
1227 } 1373 }
1228 1374
1229 $map->path ($key); 1375 $map->path ($key);
1230 $map->{path} = $path; 1376 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1377 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1378
1379 Coro::cede;
1233 1380
1234 if ($map->should_reset) { 1381 if ($map->should_reset) {
1235 $map->reset; 1382 $map->reset;
1236 undef $guard; 1383 undef $guard;
1237 $map = find_map $path 1384 $map = find $path
1238 or return; 1385 or return;
1239 } 1386 }
1240 1387
1241 $cf::MAP{$key} = $map 1388 $cf::MAP{$key} = $map
1242 } 1389 }
1265 $self->clear_unique_items; 1412 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1413 $self->load_objects ($uniq, 0);
1267 } 1414 }
1268 } 1415 }
1269 1416
1417 Coro::cede;
1418
1270 # now do the right thing for maps 1419 # now do the right thing for maps
1271 $self->link_multipart_objects; 1420 $self->link_multipart_objects;
1272 1421
1273 if ($self->{path}->is_style_map) { 1422 if ($self->{path}->is_style_map) {
1274 $self->{deny_save} = 1; 1423 $self->{deny_save} = 1;
1275 $self->{deny_reset} = 1; 1424 $self->{deny_reset} = 1;
1276 } else { 1425 } else {
1426 $self->decay_objects;
1277 $self->fix_auto_apply; 1427 $self->fix_auto_apply;
1278 $self->decay_objects;
1279 $self->update_buttons; 1428 $self->update_buttons;
1280 $self->set_darkness_map; 1429 $self->set_darkness_map;
1281 $self->difficulty ($self->estimate_difficulty) 1430 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1431 unless $self->difficulty;
1283 $self->activate; 1432 $self->activate;
1284 } 1433 }
1285 1434
1435 Coro::cede;
1436
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1437 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1438}
1288 1439
1289sub 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 {
1290 my ($path, $origin) = @_; 1465 my ($path, $origin) = @_;
1291 1466
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1467 cf::sync_job { find $path, $origin }
1468}
1293 1469
1294 cf::sync_job { 1470sub do_load_sync {
1295 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
1296 or return; 1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1297 $map->load; 1486 $map->load;
1298 $map 1487 }
1488 Coro::schedule;
1299 } 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 ()
1300} 1506}
1301 1507
1302sub save { 1508sub save {
1303 my ($self) = @_; 1509 my ($self) = @_;
1304 1510
1511 my $lock = cf::lock_acquire "map_data:" . $self->path;
1512
1305 $self->{last_save} = $cf::RUNTIME; 1513 $self->{last_save} = $cf::RUNTIME;
1306 1514
1307 return unless $self->dirty; 1515 return unless $self->dirty;
1308 1516
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1517 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1519
1312 $self->{load_path} = $save; 1520 $self->{load_path} = $save;
1313 1521
1314 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 };
1315 1529
1316 if ($uniq) { 1530 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1532 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1533 } else {
1322} 1536}
1323 1537
1324sub swap_out { 1538sub swap_out {
1325 my ($self) = @_; 1539 my ($self) = @_;
1326 1540
1541 # save first because save cedes
1542 $self->save;
1543
1544 my $lock = cf::lock_acquire "map_data:" . $self->path;
1545
1327 return if $self->players; 1546 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1547 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1548 return if $self->{deny_save};
1330 1549
1331 $self->save;
1332 $self->clear; 1550 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1551 $self->in_memory (cf::MAP_SWAPPED);
1334} 1552}
1335 1553
1336sub reset_at { 1554sub reset_at {
1350 my ($self) = @_; 1568 my ($self) = @_;
1351 1569
1352 $self->reset_at <= $cf::RUNTIME 1570 $self->reset_at <= $cf::RUNTIME
1353} 1571}
1354 1572
1355sub unlink_save {
1356 my ($self) = @_;
1357
1358 utf8::encode (my $save = $self->{path}->save_path);
1359 aioreq_pri 3; IO::AIO::aio_unlink $save;
1360 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1361}
1362
1363sub rename { 1573sub rename {
1364 my ($self, $new_path) = @_; 1574 my ($self, $new_path) = @_;
1365 1575
1366 $self->unlink_save; 1576 $self->{path}->unlink_save;
1367 1577
1368 delete $cf::MAP{$self->path}; 1578 delete $cf::MAP{$self->path};
1369 $self->{path} = new cf::path $new_path; 1579 $self->{path} = new cf::path $new_path;
1370 $self->path ($self->{path}->as_string); 1580 $self->path ($self->{path}->as_string);
1371 $cf::MAP{$self->path} = $self; 1581 $cf::MAP{$self->path} = $self;
1374} 1584}
1375 1585
1376sub reset { 1586sub reset {
1377 my ($self) = @_; 1587 my ($self) = @_;
1378 1588
1589 my $lock = cf::lock_acquire "map_data:" . $self->path;
1590
1379 return if $self->players; 1591 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1592 return if $self->{path}{user_rel};#d#
1381 1593
1382 warn "resetting map ", $self->path;#d# 1594 warn "resetting map ", $self->path;#d#
1383 1595
1384 delete $cf::MAP{$self->path}; 1596 delete $cf::MAP{$self->path};
1385 1597
1386 $_->clear_links_to ($self) for values %cf::MAP; 1598 $_->clear_links_to ($self) for values %cf::MAP;
1387 1599
1388 $self->unlink_save; 1600 $self->{path}->unlink_save;
1389 $self->destroy; 1601 $self->destroy;
1390} 1602}
1391 1603
1392my $nuke_counter = "aaaa"; 1604my $nuke_counter = "aaaa";
1393 1605
1398 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1399 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->rename ("{nuke}/" . ($nuke_counter++));
1400 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1401} 1613}
1402 1614
1403sub customise_for { 1615=item cf::map::unique_maps
1404 my ($map, $ob) = @_;
1405 1616
1406 if ($map->per_player) { 1617Returns an arrayref of cf::path's of all shared maps that have
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1618instantiated unique items. May block.
1408 }
1409 1619
1410 $map 1620=cut
1411}
1412 1621
1413sub emergency_save { 1622sub unique_maps() {
1414 local $cf::FREEZE = 1; 1623 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1624 or return;
1415 1625
1416 warn "enter emergency map save\n"; 1626 my @paths;
1417 1627
1418 cf::sync_job { 1628 for (@$files) {
1419 warn "begin emergency map save\n"; 1629 utf8::decode $_;
1420 $_->save for values %cf::MAP; 1630 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o;
1632
1633 push @paths, new cf::path $_;
1421 }; 1634 }
1422 1635
1423 warn "end emergency map save\n"; 1636 \@paths
1424} 1637}
1425 1638
1426package cf; 1639package cf;
1427 1640
1428=back 1641=back
1429 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
1430 1669
1431=head3 cf::object::player 1670=head3 cf::object::player
1432 1671
1433=over 4 1672=over 4
1434 1673
1509 my $link_pos = delete $self->{_link_pos}; 1748 my $link_pos = delete $self->{_link_pos};
1510 1749
1511 unless ($map) { 1750 unless ($map) {
1512 # restore original map position 1751 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1752 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1753 $map = cf::map::find $map;
1515 1754
1516 unless ($map) { 1755 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1756 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1757 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1758 or die "FATAL: cannot load emergency map\n";
1520 } 1759 }
1521 } 1760 }
1522 1761
1523 ($x, $y) = (-1, -1) 1762 ($x, $y) = (-1, -1)
1526 # use -1 or undef as default coordinates, not 0, 0 1765 # use -1 or undef as default coordinates, not 0, 0
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1766 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1767 if $x <=0 && $y <= 0;
1529 1768
1530 $map->load; 1769 $map->load;
1770 $map->load_diag;
1531 1771
1772 return unless $self->contr->active;
1532 $self->activate_recursive; 1773 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1774 $self->enter_map ($map, $x, $y);
1534} 1775}
1535 1776
1536cf::player->attach ( 1777cf::player->attach (
1549 1790
1550 # try to abort aborted map switching on player login :) 1791 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1792 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1793 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1794 $pl->ob->enter_link;
1554 cf::async { 1795 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1796 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 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);
1557 Coro::Timer::sleep 1; 1802 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1803 $pl->ob->leave_link;
1559 }; 1804 })->prio (2);
1560 } 1805 }
1561 }, 1806 },
1562); 1807);
1563 1808
1564=item $player_object->goto_map ($path, $x, $y) 1809=item $player_object->goto ($path, $x, $y)
1565 1810
1566=cut 1811=cut
1567 1812
1568sub cf::object::player::goto_map { 1813sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1814 my ($self, $path, $x, $y) = @_;
1570 1815
1816 $path = new cf::path $path;
1817
1571 $self->enter_link; 1818 $self->enter_link;
1572 1819
1573 (cf::async { 1820 (async {
1574 $path = new cf::path $path;
1575
1576 my $map = cf::map::find_map $path->as_string; 1821 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1822 $map = $map->{path}->customise_for ($map, $self) if $map;
1578 1823
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1824# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1825# if $map;
1581 1826
1582 $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);
1583 1828
1584 $self->leave_link ($map, $x, $y); 1829 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1830 })->prio (1);
1586} 1831}
1587 1832
1640 1885
1641 return unless $self->type == cf::PLAYER; 1886 return unless $self->type == cf::PLAYER;
1642 1887
1643 $self->enter_link; 1888 $self->enter_link;
1644 1889
1645 (cf::async { 1890 (async {
1891 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1892 unless (eval {
1647 prepare_random_map $exit 1893 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1894 if $exit->slaying eq "/!";
1649 1895
1650 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;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1898
1653 1; 1899 1;
1654 }) { 1900 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1901 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "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. "
1657 . "Please report this to the dungeon master", 1903 . "Please report this to the dungeon master!",
1658 cf::NDI_UNIQUE | cf::NDI_RED); 1904 cf::NDI_UNIQUE | cf::NDI_RED);
1659 1905
1660 warn "ERROR in enter_exit: $@"; 1906 warn "ERROR in enter_exit: $@";
1661 $self->leave_link; 1907 $self->leave_link;
1662 } 1908 }
1730 } 1976 }
1731 } 1977 }
1732 }, 1978 },
1733); 1979);
1734 1980
1735=item $client->coro (\&cb) 1981=item $client->async (\&cb)
1736 1982
1737Create a new coroutine, running the specified callback. The coroutine will 1983Create a new coroutine, running the specified callback. The coroutine will
1738be automatically cancelled when the client gets destroyed (e.g. on logout, 1984be automatically cancelled when the client gets destroyed (e.g. on logout,
1739or loss of connection). 1985or loss of connection).
1740 1986
1741=cut 1987=cut
1742 1988
1743sub cf::client::coro { 1989sub cf::client::async {
1744 my ($self, $cb) = @_; 1990 my ($self, $cb) = @_;
1745 1991
1746 my $coro = &cf::async ($cb); 1992 my $coro = &Coro::async ($cb);
1747 1993
1748 $coro->on_destroy (sub { 1994 $coro->on_destroy (sub {
1749 delete $self->{_coro}{$coro+0}; 1995 delete $self->{_coro}{$coro+0};
1750 }); 1996 });
1751 1997
1986 open my $fh, "<:utf8", cf::confdir . "/config" 2232 open my $fh, "<:utf8", cf::confdir . "/config"
1987 or return; 2233 or return;
1988 2234
1989 local $/; 2235 local $/;
1990 *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 }
1991} 2250}
1992 2251
1993sub main { 2252sub main {
1994 # we must not ever block the main coroutine 2253 # we must not ever block the main coroutine
1995 local $Coro::idle = sub { 2254 local $Coro::idle = sub {
1996 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#
1997 (Coro::unblock_sub {
1998 Event::one_event; 2256 async { Event::one_event };
1999 })->();
2000 }; 2257 };
2001 2258
2002 cfg_load; 2259 cfg_load;
2003 db_load; 2260 db_load;
2004 load_extensions; 2261 load_extensions;
2005 Event::loop; 2262 Event::loop;
2006} 2263}
2007 2264
2008############################################################################# 2265#############################################################################
2009# 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}
2010 2309
2011sub reload() { 2310sub reload() {
2012 # can/must only be called in main 2311 # can/must only be called in main
2013 if ($Coro::current != $Coro::main) { 2312 if ($Coro::current != $Coro::main) {
2014 warn "can only reload from main coroutine\n"; 2313 warn "can only reload from main coroutine\n";
2015 return; 2314 return;
2016 } 2315 }
2017 2316
2018 warn "reloading..."; 2317 warn "reloading...";
2019 2318
2020 local $FREEZE = 1; 2319 warn "freezing server";
2320 my $guard = freeze_mainloop;
2021 cf::emergency_save; 2321 cf::emergency_save;
2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2022 2326
2023 eval { 2327 eval {
2024 # 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
2025 2329
2026 # cancel all watchers 2330 warn "cancel all watchers";
2027 for (Event::all_watchers) { 2331 for (Event::all_watchers) {
2028 $_->cancel if $_->data & WF_AUTOCANCEL; 2332 $_->cancel if $_->data & WF_AUTOCANCEL;
2029 } 2333 }
2030 2334
2031 # cancel all extension coros 2335 warn "cancel all extension coros";
2032 $_->cancel for values %EXT_CORO; 2336 $_->cancel for values %EXT_CORO;
2033 %EXT_CORO = (); 2337 %EXT_CORO = ();
2034 2338
2339 warn "remove commands";
2340 %COMMAND = ();
2341
2342 warn "remove ext commands";
2343 %EXTCMD = ();
2344
2035 # unload all extensions 2345 warn "unload/nuke all extensions";
2036 for (@exts) { 2346 for my $pkg (@EXTS) {
2037 warn "unloading <$_>"; 2347 warn "... unloading $pkg";
2038 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: $@";
2039 } 2354 }
2040 2355
2356 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg;
2358 }
2359
2041 # unload all modules loaded from $LIBDIR 2360 warn "unload all perl modules loaded from $LIBDIR";
2042 while (my ($k, $v) = each %INC) { 2361 while (my ($k, $v) = each %INC) {
2043 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2044 2363
2045 warn "removing <$k>"; 2364 warn "removing <$k>";
2046 delete $INC{$k}; 2365 delete $INC{$k};
2053 } 2372 }
2054 2373
2055 Symbol::delete_package $k; 2374 Symbol::delete_package $k;
2056 } 2375 }
2057 2376
2058 # sync database to disk
2059 cf::db_sync;
2060 IO::AIO::flush;
2061
2062 # get rid of safe::, as good as possible 2377 warn "get rid of safe::, as good as possible";
2063 Symbol::delete_package "safe::$_" 2378 Symbol::delete_package "safe::$_"
2064 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);
2065 2380
2066 # remove register_script_function callbacks
2067 # TODO
2068
2069 # unload cf.pm "a bit" 2381 warn "unload cf.pm \"a bit\"";
2070 delete $INC{"cf.pm"}; 2382 delete $INC{"cf.pm"};
2071 2383
2072 # don't, removes xs symbols, too, 2384 # don't, removes xs symbols, too,
2073 # and global variables created in xs 2385 # and global variables created in xs
2074 #Symbol::delete_package __PACKAGE__; 2386 #Symbol::delete_package __PACKAGE__;
2075 2387
2076 # reload cf.pm
2077 warn "reloading cf.pm"; 2388 warn "reloading cf.pm";
2078 require cf; 2389 require cf;
2079 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2080 2391
2081 # load config and database again 2392 warn "load config and database again";
2082 cf::cfg_load; 2393 cf::cfg_load;
2083 cf::db_load; 2394 cf::db_load;
2084 2395
2085 # load extensions
2086 warn "load extensions"; 2396 warn "load extensions";
2087 cf::load_extensions; 2397 cf::load_extensions;
2088 2398
2089 # reattach attachments to objects 2399 warn "reattach attachments to objects/players";
2090 warn "reattach";
2091 _global_reattach; 2400 _global_reattach;
2401 warn "reattach attachments to maps";
2402 reattach $_ for values %MAP;
2092 }; 2403 };
2093 2404
2094 if ($@) { 2405 if ($@) {
2095 warn $@; 2406 warn $@;
2096 warn "error while reloading, exiting."; 2407 warn "error while reloading, exiting.";
2097 exit 1; 2408 exit 1;
2098 } 2409 }
2099 2410
2100 warn "reloaded successfully"; 2411 warn "reloaded";
2101}; 2412};
2102 2413
2103############################################################################# 2414#############################################################################
2104 2415
2105unless ($LINK_MAP) { 2416unless ($LINK_MAP) {
2112 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2113 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2114 2425
2115 # dirty hack because... archetypes are not yet loaded 2426 # dirty hack because... archetypes are not yet loaded
2116 Event->timer ( 2427 Event->timer (
2117 after => 2, 2428 after => 10,
2118 cb => sub { 2429 cb => sub {
2119 $_[0]->w->cancel; 2430 $_[0]->w->cancel;
2120 2431
2121 # provide some exits "home" 2432 # provide some exits "home"
2122 my $exit = cf::object::new "exit"; 2433 my $exit = cf::object::new "exit";
2141 $LINK_MAP->{deny_reset} = 1; 2452 $LINK_MAP->{deny_reset} = 1;
2142 2453
2143 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2144} 2455}
2145 2456
2146register "<global>", __PACKAGE__;
2147
2148register_command "reload" => sub { 2457register_command "reload" => sub {
2149 my ($who, $arg) = @_; 2458 my ($who, $arg) = @_;
2150 2459
2151 if ($who->flag (FLAG_WIZ)) { 2460 if ($who->flag (FLAG_WIZ)) {
2152 $who->message ("start of reload."); 2461 $who->message ("start of reload.");
2161 reentrant => 0, 2470 reentrant => 0,
2162 prio => 0, 2471 prio => 0,
2163 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2164 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2165 cb => sub { 2474 cb => sub {
2166 unless ($FREEZE) { 2475 $NOW = Event::time;
2476
2167 cf::server_tick; # one server iteration 2477 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2478 $RUNTIME += $TICK;
2169 }
2170
2171 $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;
2172 2483
2173 # 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
2174 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2175 2486
2176 $TICK_WATCHER->at ($NEXT_TICK); 2487 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines