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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines