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.125 by root, Tue Jan 2 23:06:39 2007 UTC vs.
Revision 1.164 by root, Thu Jan 11 01:24:25 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}
449 ? undef
450 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
451}
452
453# return random map parameters, or undef
454sub random_map_params {
455 my ($self) = @_;
456
457 $self->{random}
458} 502}
459 503
460# this is somewhat ugly, but style maps do need special treatment 504# this is somewhat ugly, but style maps do need special treatment
461sub is_style_map { 505sub is_style_map {
462 $_[0]{path} =~ m{^/styles/} 506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
463} 527}
464 528
465package cf; 529package cf;
466 530
467############################################################################# 531#############################################################################
917=cut 981=cut
918 982
919sub register_extcmd { 983sub register_extcmd {
920 my ($name, $cb) = @_; 984 my ($name, $cb) = @_;
921 985
922 my $caller = caller;
923 #warn "registering extcmd '$name' to '$caller'";
924
925 $EXTCMD{$name} = [$cb, $caller]; 986 $EXTCMD{$name} = $cb;
926} 987}
927 988
928cf::player->attach ( 989cf::player->attach (
929 on_command => sub { 990 on_command => sub {
930 my ($pl, $name, $params) = @_; 991 my ($pl, $name, $params) = @_;
943 1004
944 my $msg = eval { from_json $buf }; 1005 my $msg = eval { from_json $buf };
945 1006
946 if (ref $msg) { 1007 if (ref $msg) {
947 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1008 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
948 if (my %reply = $cb->[0]->($pl, $msg)) { 1009 if (my %reply = $cb->($pl, $msg)) {
949 $pl->ext_reply ($msg->{msgid}, %reply); 1010 $pl->ext_reply ($msg->{msgid}, %reply);
950 } 1011 }
951 } 1012 }
952 } else { 1013 } else {
953 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1014 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
955 1016
956 cf::override; 1017 cf::override;
957 }, 1018 },
958); 1019);
959 1020
960sub register {
961 my ($base, $pkg) = @_;
962
963 #TODO
964}
965
966sub load_extension { 1021sub load_extension {
967 my ($path) = @_; 1022 my ($path) = @_;
968 1023
969 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1024 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
970 my $base = $1; 1025 my $base = $1;
971 my $pkg = $1; 1026 my $pkg = $1;
972 $pkg =~ s/[^[:word:]]/_/g; 1027 $pkg =~ s/[^[:word:]]/_/g;
973 $pkg = "ext::$pkg"; 1028 $pkg = "ext::$pkg";
974 1029
975 warn "loading '$path' into '$pkg'\n"; 1030 warn "... loading '$path' into '$pkg'\n";
976 1031
977 open my $fh, "<:utf8", $path 1032 open my $fh, "<:utf8", $path
978 or die "$path: $!"; 1033 or die "$path: $!";
979 1034
980 my $source = 1035 my $source =
985 1040
986 eval $source 1041 eval $source
987 or die $@ ? "$path: $@\n" 1042 or die $@ ? "$path: $@\n"
988 : "extension disabled.\n"; 1043 : "extension disabled.\n";
989 1044
990 push @exts, $pkg; 1045 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} 1046}
1035 1047
1036sub load_extensions { 1048sub load_extensions {
1037 for my $ext (<$LIBDIR/*.ext>) { 1049 for my $ext (<$LIBDIR/*.ext>) {
1038 next unless -r $ext; 1050 next unless -r $ext;
1056}; 1068};
1057 1069
1058cf::map->attach (prio => -10000, package => cf::mapsupport::); 1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1059 1071
1060############################################################################# 1072#############################################################################
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 1073
1084=head2 CORE EXTENSIONS 1074=head2 CORE EXTENSIONS
1085 1075
1086Functions and methods that extend core crossfire objects. 1076Functions and methods that extend core crossfire objects.
1087 1077
1078=cut
1079
1080package cf::player;
1081
1082use Coro::AIO;
1083
1088=head3 cf::player 1084=head3 cf::player
1089 1085
1090=over 4 1086=over 4
1091 1087
1092=item cf::player::exists $login 1088=item cf::player::find $login
1093 1089
1094Returns true when the given account exists. 1090Returns the given player object, loading it if necessary (might block).
1095 1091
1096=cut 1092=cut
1097 1093
1098sub cf::player::exists($) { 1094sub playerdir($) {
1099 cf::player::find $_[0] 1095 cf::localdir
1100 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1096 . "/"
1097 . cf::playerdir
1098 . "/"
1099 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1100}
1101
1102sub path($) {
1103 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1104
1105 (playerdir $login) . "/$login.pl"
1106}
1107
1108sub find_active($) {
1109 $cf::PLAYER{$_[0]}
1110 and $cf::PLAYER{$_[0]}->active
1111 and $cf::PLAYER{$_[0]}
1112}
1113
1114sub exists($) {
1115 my ($login) = @_;
1116
1117 $cf::PLAYER{$login}
1118 or cf::sync_job { !aio_stat $login }
1119}
1120
1121sub find($) {
1122 return $cf::PLAYER{$_[0]} || do {
1123 my $login = $_[0];
1124
1125 my $guard = cf::lock_acquire "user_find:$login";
1126
1127 $cf::PLAYER{$_[0]} || do {
1128 my $pl = load_pl path $login
1129 or return;
1130 $cf::PLAYER{$login} = $pl
1131 }
1132 }
1133}
1134
1135sub save($) {
1136 my ($pl) = @_;
1137
1138 return if $pl->{deny_save};
1139
1140 my $path = path $pl;
1141 my $guard = cf::lock_acquire "user_save:$path";
1142
1143 return if $pl->{deny_save};
1144
1145 aio_mkdir playerdir $pl, 0770;
1146 $pl->{last_save} = $cf::RUNTIME;
1147
1148 $pl->save_pl ($path);
1149 Coro::cede;
1150}
1151
1152sub new($) {
1153 my ($login) = @_;
1154
1155 my $self = create;
1156
1157 $self->ob->name ($login);
1158 $self->{deny_save} = 1;
1159
1160 $cf::PLAYER{$login} = $self;
1161
1162 $self
1163}
1164
1165=item $pl->quit_character
1166
1167Nukes the player without looking back. If logged in, the connection will
1168be destroyed. May block for a long time.
1169
1170=cut
1171
1172sub quit_character {
1173 my ($pl) = @_;
1174
1175 $pl->{deny_save} = 1;
1176 $pl->password ("*"); # this should lock out the player until we nuked the dir
1177
1178 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1179 $pl->deactivate;
1180 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1181 $pl->ns->destroy if $pl->ns;
1182
1183 my $path = playerdir $pl;
1184 my $temp = "$path~$cf::RUNTIME~deleting~";
1185 aio_rename $path, $temp;
1186 delete $cf::PLAYER{$pl->ob->name};
1187 $pl->destroy;
1188 IO::AIO::aio_rmtree $temp;
1189}
1190
1191=item cf::player::list_logins
1192
1193Returns am arrayref of all valid playernames in the system, can take a
1194while and may block, so not sync_job-capable, ever.
1195
1196=cut
1197
1198sub list_logins {
1199 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1200 or return [];
1201
1202 my @logins;
1203
1204 for my $login (@$dirs) {
1205 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1206 aio_read $fh, 0, 512, my $buf, 0 or next;
1207 $buf !~ /^password -------------$/m or next; # official not-valid tag
1208
1209 utf8::decode $login;
1210 push @logins, $login;
1211 }
1212
1213 \@logins
1214}
1215
1216=item $player->maps
1217
1218Returns an arrayref of cf::path's of all maps that are private for this
1219player. May block.
1220
1221=cut
1222
1223sub maps($) {
1224 my ($pl) = @_;
1225
1226 my $files = aio_readdir playerdir $pl
1227 or return;
1228
1229 my @paths;
1230
1231 for (@$files) {
1232 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o;
1235
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1237 }
1238
1239 \@paths
1101} 1240}
1102 1241
1103=item $player->ext_reply ($msgid, $msgtype, %msg) 1242=item $player->ext_reply ($msgid, $msgtype, %msg)
1104 1243
1105Sends an ext reply to the player. 1244Sends an ext reply to the player.
1106 1245
1107=cut 1246=cut
1108 1247
1109sub cf::player::ext_reply($$$%) { 1248sub ext_reply($$$%) {
1110 my ($self, $id, %msg) = @_; 1249 my ($self, $id, %msg) = @_;
1111 1250
1112 $msg{msgid} = $id; 1251 $msg{msgid} = $id;
1113 1252
1114 $self->send ("ext " . to_json \%msg); 1253 $self->send ("ext " . cf::to_json \%msg);
1115} 1254}
1255
1256package cf;
1116 1257
1117=back 1258=back
1118 1259
1119 1260
1120=head3 cf::map 1261=head3 cf::map
1126package cf::map; 1267package cf::map;
1127 1268
1128use Fcntl; 1269use Fcntl;
1129use Coro::AIO; 1270use Coro::AIO;
1130 1271
1131our $MAX_RESET = 7200; 1272our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1273our $DEFAULT_RESET = 3000;
1133 1274
1134sub generate_random_map { 1275sub generate_random_map {
1135 my ($path, $rmp) = @_; 1276 my ($path, $rmp) = @_;
1136 1277
1137 # mit "rum" bekleckern, nicht 1278 # mit "rum" bekleckern, nicht
1138 cf::map::_create_random_map 1279 cf::map::_create_random_map (
1139 $path, 1280 $path,
1140 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1141 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1142 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1143 $rmp->{exit_on_final_map}, 1284 $rmp->{exit_on_final_map},
1145 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1286 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1146 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1287 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1147 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1288 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1148 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1289 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1149 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1150 (cf::region::find $rmp->{region}) 1291 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 )
1151} 1293}
1152 1294
1153# and all this just because we cannot iterate over 1295# and all this just because we cannot iterate over
1154# all maps in C++... 1296# all maps in C++...
1155sub change_all_map_light { 1297sub change_all_map_light {
1157 1299
1158 $_->change_map_light ($change) 1300 $_->change_map_light ($change)
1159 for grep $_->outdoor, values %cf::MAP; 1301 for grep $_->outdoor, values %cf::MAP;
1160} 1302}
1161 1303
1162sub try_load_header($) { 1304sub load_map_header($) {
1163 my ($path) = @_; 1305 my ($path) = @_;
1164 1306
1165 utf8::encode $path; 1307 utf8::encode $path;
1166 aio_open $path, O_RDONLY, 0 1308 aio_open $path, O_RDONLY, 0
1167 or return; 1309 or return;
1168 1310
1169 my $map = cf::map::new 1311 my $map = cf::map::new
1170 or return; 1312 or return;
1171 1313
1314 # for better error messages only, will be overwritten later
1315 $map->path ($path);
1316
1172 $map->load_header ($path) 1317 $map->load_header ($path)
1173 or return; 1318 or return;
1174 1319
1175 $map->{load_path} = $path; 1320 $map->{load_path} = $path;
1176 1321
1177 $map 1322 $map
1178} 1323}
1179 1324
1325sub find;
1180sub find_map { 1326sub find {
1181 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1182 1328
1183 #warn "find_map<$path,$origin>\n";#d# 1329 #warn "find<$path,$origin>\n";#d#
1184 1330
1185 $path = new cf::path $path, $origin && $origin->path; 1331 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1332 my $key = $path->as_string;
1187 1333
1188 cf::lock_wait "map_find:$key"; 1334 cf::lock_wait "map_find:$key";
1189 1335
1190 $cf::MAP{$key} || do { 1336 $cf::MAP{$key} || do {
1191 my $guard = cf::lock_acquire "map_find:$key"; 1337 my $guard = cf::lock_acquire "map_find:$key";
1192 1338
1193 # do it the slow way 1339 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1340 my $map = $path->load_temp;
1341
1342 Coro::cede;
1195 1343
1196 if ($map) { 1344 if ($map) {
1345 $map->last_access ((delete $map->{last_access})
1346 || $cf::RUNTIME); #d#
1197 # safety 1347 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1348 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1349 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1350 } else {
1201 if (my $rmp = $path->random_map_params) { 1351 $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; 1352 or return;
1208 1353
1209 $map->{load_original} = 1; 1354 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1355 $map->{instantiate_time} = $cf::RUNTIME;
1356 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1357 $map->instantiate;
1212 1358
1213 # per-player maps become, after loading, normal maps 1359 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1360 $map->per_player (0) if $path->{user_rel};
1215 } 1361 }
1216 1362
1217 $map->path ($key); 1363 $map->path ($key);
1218 $map->{path} = $path; 1364 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1365 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1366
1367 Coro::cede;
1221 1368
1222 if ($map->should_reset) { 1369 if ($map->should_reset) {
1223 $map->reset; 1370 $map->reset;
1224 undef $guard; 1371 undef $guard;
1225 $map = cf::map::find_map ($path) 1372 $map = find $path
1226 or return; 1373 or return;
1227 } 1374 }
1228 1375
1229 $cf::MAP{$key} = $map 1376 $cf::MAP{$key} = $map
1230 } 1377 }
1253 $self->clear_unique_items; 1400 $self->clear_unique_items;
1254 $self->load_objects ($uniq, 0); 1401 $self->load_objects ($uniq, 0);
1255 } 1402 }
1256 } 1403 }
1257 1404
1405 Coro::cede;
1406
1258 # now do the right thing for maps 1407 # now do the right thing for maps
1259 $self->link_multipart_objects; 1408 $self->link_multipart_objects;
1260 1409
1261 if ($self->{path}->is_style_map) { 1410 if ($self->{path}->is_style_map) {
1262 $self->{deny_save} = 1; 1411 $self->{deny_save} = 1;
1263 $self->{deny_reset} = 1; 1412 $self->{deny_reset} = 1;
1264 } else { 1413 } else {
1414 $self->decay_objects;
1265 $self->fix_auto_apply; 1415 $self->fix_auto_apply;
1266 $self->decay_objects;
1267 $self->update_buttons; 1416 $self->update_buttons;
1268 $self->set_darkness_map; 1417 $self->set_darkness_map;
1269 $self->difficulty ($self->estimate_difficulty) 1418 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1419 unless $self->difficulty;
1271 $self->activate; 1420 $self->activate;
1272 } 1421 }
1273 1422
1423 Coro::cede;
1424
1274 $self->in_memory (cf::MAP_IN_MEMORY); 1425 $self->in_memory (cf::MAP_IN_MEMORY);
1275} 1426}
1276 1427
1277sub load_map_sync { 1428# find and load all maps in the 3x3 area around a map
1429sub load_diag {
1430 my ($map) = @_;
1431
1432 my @diag; # diagonal neighbours
1433
1434 for (0 .. 3) {
1435 my $neigh = $map->tile_path ($_)
1436 or next;
1437 $neigh = find $neigh, $map
1438 or next;
1439 $neigh->load;
1440
1441 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1442 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1443 }
1444
1445 for (@diag) {
1446 my $neigh = find @$_
1447 or next;
1448 $neigh->load;
1449 }
1450}
1451
1452sub find_sync {
1278 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1279 1454
1280 #warn "load_map_sync<$path, $origin>\n";#d# 1455 cf::sync_job { find $path, $origin }
1456}
1281 1457
1282 cf::sync_job { 1458sub do_load_sync {
1283 my $map = cf::map::find_map $path, $origin 1459 my ($map) = @_;
1460
1461 cf::sync_job { $map->load };
1462}
1463
1464our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async {
1466 while () {
1467 while (%MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH
1284 or return; 1469 or next;
1470 my $path = delete $MAP_PREFETCH{$key};
1471
1472 my $map = find $path
1473 or next;
1285 $map->load; 1474 $map->load;
1286 $map 1475 }
1476 Coro::schedule;
1287 } 1477 }
1478};
1479
1480sub find_async {
1481 my ($path, $origin) = @_;
1482
1483 $path = new cf::path $path, $origin && $origin->path;
1484 my $key = $path->as_string;
1485
1486 if (my $map = $cf::MAP{$key}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 }
1489
1490 $MAP_PREFETCH{$key} = $path;
1491 $MAP_PREFETCHER->ready;
1492
1493 ()
1288} 1494}
1289 1495
1290sub save { 1496sub save {
1291 my ($self) = @_; 1497 my ($self) = @_;
1292 1498
1499 my $lock = cf::lock_acquire "map_data:" . $self->path;
1500
1293 $self->{last_save} = $cf::RUNTIME; 1501 $self->{last_save} = $cf::RUNTIME;
1294 1502
1295 return unless $self->dirty; 1503 return unless $self->dirty;
1296 1504
1297 my $save = $self->{path}->save_path; utf8::encode $save; 1505 my $save = $self->{path}->save_path; utf8::encode $save;
1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1506 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1299 1507
1300 $self->{load_path} = $save; 1508 $self->{load_path} = $save;
1301 1509
1302 return if $self->{deny_save}; 1510 return if $self->{deny_save};
1511
1512 local $self->{last_access} = $self->last_access;#d#
1513
1514 cf::async {
1515 $_->contr->save for $self->players;
1516 };
1303 1517
1304 if ($uniq) { 1518 if ($uniq) {
1305 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1306 $self->save_objects ($uniq, cf::IO_UNIQUES); 1520 $self->save_objects ($uniq, cf::IO_UNIQUES);
1307 } else { 1521 } else {
1310} 1524}
1311 1525
1312sub swap_out { 1526sub swap_out {
1313 my ($self) = @_; 1527 my ($self) = @_;
1314 1528
1529 # save first because save cedes
1530 $self->save;
1531
1532 my $lock = cf::lock_acquire "map_data:" . $self->path;
1533
1315 return if $self->players; 1534 return if $self->players;
1316 return if $self->in_memory != cf::MAP_IN_MEMORY; 1535 return if $self->in_memory != cf::MAP_IN_MEMORY;
1317 return if $self->{deny_save}; 1536 return if $self->{deny_save};
1318 1537
1319 $self->save;
1320 $self->clear; 1538 $self->clear;
1321 $self->in_memory (cf::MAP_SWAPPED); 1539 $self->in_memory (cf::MAP_SWAPPED);
1322} 1540}
1323 1541
1324sub reset_at { 1542sub reset_at {
1338 my ($self) = @_; 1556 my ($self) = @_;
1339 1557
1340 $self->reset_at <= $cf::RUNTIME 1558 $self->reset_at <= $cf::RUNTIME
1341} 1559}
1342 1560
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 { 1561sub rename {
1352 my ($self, $new_path) = @_; 1562 my ($self, $new_path) = @_;
1353 1563
1354 $self->unlink_save; 1564 $self->{path}->unlink_save;
1355 1565
1356 delete $cf::MAP{$self->path}; 1566 delete $cf::MAP{$self->path};
1357 $self->{path} = new cf::path $new_path; 1567 $self->{path} = new cf::path $new_path;
1358 $self->path ($self->{path}->as_string); 1568 $self->path ($self->{path}->as_string);
1359 $cf::MAP{$self->path} = $self; 1569 $cf::MAP{$self->path} = $self;
1362} 1572}
1363 1573
1364sub reset { 1574sub reset {
1365 my ($self) = @_; 1575 my ($self) = @_;
1366 1576
1577 my $lock = cf::lock_acquire "map_data:" . $self->path;
1578
1367 return if $self->players; 1579 return if $self->players;
1368 return if $self->{path}{user_rel};#d# 1580 return if $self->{path}{user_rel};#d#
1369 1581
1370 warn "resetting map ", $self->path;#d# 1582 warn "resetting map ", $self->path;#d#
1371 1583
1372 delete $cf::MAP{$self->path}; 1584 delete $cf::MAP{$self->path};
1373 1585
1374 $_->clear_links_to ($self) for values %cf::MAP; 1586 $_->clear_links_to ($self) for values %cf::MAP;
1375 1587
1376 $self->unlink_save; 1588 $self->{path}->unlink_save;
1377 $self->destroy; 1589 $self->destroy;
1378} 1590}
1379 1591
1380my $nuke_counter = "aaaa"; 1592my $nuke_counter = "aaaa";
1381 1593
1390 1602
1391sub customise_for { 1603sub customise_for {
1392 my ($map, $ob) = @_; 1604 my ($map, $ob) = @_;
1393 1605
1394 if ($map->per_player) { 1606 if ($map->per_player) {
1395 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1396 } 1608 }
1397 1609
1398 $map 1610 $map
1399} 1611}
1400 1612
1401sub emergency_save { 1613=item cf::map::unique_maps
1402 local $cf::FREEZE = 1;
1403 1614
1404 warn "enter emergency map save\n"; 1615Returns an arrayref of cf::path's of all shared maps that have
1616instantiated unique items. May block.
1405 1617
1406 cf::sync_job { 1618=cut
1407 warn "begin emergency map save\n"; 1619
1408 $_->save for values %cf::MAP; 1620sub unique_maps() {
1621 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1622 or return;
1623
1624 my @paths;
1625
1626 for (@$files) {
1627 utf8::decode $_;
1628 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o;
1630
1631 push @paths, new cf::path $_;
1409 }; 1632 }
1410 1633
1411 warn "end emergency map save\n"; 1634 \@paths
1412} 1635}
1413 1636
1414package cf; 1637package cf;
1415 1638
1416=back 1639=back
1417 1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1646
1647=over 4
1648
1649=item $ob->inv_recursive
1650
1651Returns the inventory of the object _and_ their inventories, recursively.
1652
1653=cut
1654
1655sub inv_recursive_;
1656sub inv_recursive_ {
1657 map { $_, inv_recursive_ $_->inv } @_
1658}
1659
1660sub inv_recursive {
1661 inv_recursive_ inv $_[0]
1662}
1663
1664package cf;
1665
1666=back
1418 1667
1419=head3 cf::object::player 1668=head3 cf::object::player
1420 1669
1421=over 4 1670=over 4
1422 1671
1497 my $link_pos = delete $self->{_link_pos}; 1746 my $link_pos = delete $self->{_link_pos};
1498 1747
1499 unless ($map) { 1748 unless ($map) {
1500 # restore original map position 1749 # restore original map position
1501 ($map, $x, $y) = @{ $link_pos || [] }; 1750 ($map, $x, $y) = @{ $link_pos || [] };
1502 $map = cf::map::find_map $map; 1751 $map = cf::map::find $map;
1503 1752
1504 unless ($map) { 1753 unless ($map) {
1505 ($map, $x, $y) = @$EMERGENCY_POSITION; 1754 ($map, $x, $y) = @$EMERGENCY_POSITION;
1506 $map = cf::map::find_map $map 1755 $map = cf::map::find $map
1507 or die "FATAL: cannot load emergency map\n"; 1756 or die "FATAL: cannot load emergency map\n";
1508 } 1757 }
1509 } 1758 }
1510 1759
1511 ($x, $y) = (-1, -1) 1760 ($x, $y) = (-1, -1)
1514 # use -1 or undef as default coordinates, not 0, 0 1763 # use -1 or undef as default coordinates, not 0, 0
1515 ($x, $y) = ($map->enter_x, $map->enter_y) 1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1516 if $x <=0 && $y <= 0; 1765 if $x <=0 && $y <= 0;
1517 1766
1518 $map->load; 1767 $map->load;
1768 $map->load_diag;
1519 1769
1770 return unless $self->contr->active;
1520 $self->activate_recursive; 1771 $self->activate_recursive;
1521 $self->enter_map ($map, $x, $y); 1772 $self->enter_map ($map, $x, $y);
1522} 1773}
1523 1774
1524cf::player->attach ( 1775cf::player->attach (
1537 1788
1538 # try to abort aborted map switching on player login :) 1789 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes 1790 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) { 1791 if ($pl->ob->{_link_pos}) {
1541 $pl->ob->enter_link; 1792 $pl->ob->enter_link;
1542 Coro::async { 1793 (async {
1543 # we need this sleep as the login has a concurrent enter_exit running 1794 # 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 1795 # and this sleep increases chances of the player not ending up in scorn
1796 $pl->ob->reply (undef,
1797 "There was an internal problem at your last logout, "
1798 . "the server will try to bring you to your intended destination in a second.",
1799 cf::NDI_RED);
1545 Coro::Timer::sleep 1; 1800 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link; 1801 $pl->ob->leave_link;
1547 }; 1802 })->prio (2);
1548 } 1803 }
1549 }, 1804 },
1550); 1805);
1551 1806
1552=item $player_object->goto_map ($path, $x, $y) 1807=item $player_object->goto ($path, $x, $y)
1553 1808
1554=cut 1809=cut
1555 1810
1556sub cf::object::player::goto_map { 1811sub cf::object::player::goto {
1557 my ($self, $path, $x, $y) = @_; 1812 my ($self, $path, $x, $y) = @_;
1558 1813
1814 $path = new cf::path $path;
1815
1559 $self->enter_link; 1816 $self->enter_link;
1560 1817
1561 (Coro::async { 1818 (async {
1562 $path = new cf::path $path;
1563
1564 my $map = cf::map::find_map $path->as_string; 1819 my $map = cf::map::find $path->as_string;
1565 $map = $map->customise_for ($self) if $map; 1820 $map = $map->customise_for ($self) if $map;
1566 1821
1567# warn "entering ", $map->path, " at ($x, $y)\n" 1822# warn "entering ", $map->path, " at ($x, $y)\n"
1568# if $map; 1823# if $map;
1569 1824
1570 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1825 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1571 1826
1572 $self->leave_link ($map, $x, $y); 1827 $self->leave_link ($map, $x, $y);
1573 })->prio (1); 1828 })->prio (1);
1574} 1829}
1575 1830
1628 1883
1629 return unless $self->type == cf::PLAYER; 1884 return unless $self->type == cf::PLAYER;
1630 1885
1631 $self->enter_link; 1886 $self->enter_link;
1632 1887
1633 (Coro::async { 1888 (async {
1889 $self->deactivate_recursive; # just to be sure
1634 unless (eval { 1890 unless (eval {
1635
1636 prepare_random_map $exit 1891 prepare_random_map $exit
1637 if $exit->slaying eq "/!"; 1892 if $exit->slaying eq "/!";
1638 1893
1639 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1640 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1641 1896
1642 1; 1897 1;
1643 }) { 1898 }) {
1644 $self->message ("Something went wrong deep within the crossfire server. " 1899 $self->message ("Something went wrong deep within the crossfire server. "
1645 . "I'll try to bring you back to the map you were before. " 1900 . "I'll try to bring you back to the map you were before. "
1646 . "Please report this to the dungeon master", 1901 . "Please report this to the dungeon master!",
1647 cf::NDI_UNIQUE | cf::NDI_RED); 1902 cf::NDI_UNIQUE | cf::NDI_RED);
1648 1903
1649 warn "ERROR in enter_exit: $@"; 1904 warn "ERROR in enter_exit: $@";
1650 $self->leave_link; 1905 $self->leave_link;
1651 } 1906 }
1702 on_reply => sub { 1957 on_reply => sub {
1703 my ($ns, $msg) = @_; 1958 my ($ns, $msg) = @_;
1704 1959
1705 # this weird shuffling is so that direct followup queries 1960 # this weird shuffling is so that direct followup queries
1706 # get handled first 1961 # get handled first
1707 my $queue = delete $ns->{query_queue}; 1962 my $queue = delete $ns->{query_queue}
1963 or return; # be conservative, not sure how that can happen, but we saw a crash here
1708 1964
1709 (shift @$queue)->[1]->($msg); 1965 (shift @$queue)->[1]->($msg);
1710 1966
1711 push @{ $ns->{query_queue} }, @$queue; 1967 push @{ $ns->{query_queue} }, @$queue;
1712 1968
1718 } 1974 }
1719 } 1975 }
1720 }, 1976 },
1721); 1977);
1722 1978
1723=item $client->coro (\&cb) 1979=item $client->async (\&cb)
1724 1980
1725Create a new coroutine, running the specified callback. The coroutine will 1981Create a new coroutine, running the specified callback. The coroutine will
1726be automatically cancelled when the client gets destroyed (e.g. on logout, 1982be automatically cancelled when the client gets destroyed (e.g. on logout,
1727or loss of connection). 1983or loss of connection).
1728 1984
1729=cut 1985=cut
1730 1986
1731sub cf::client::coro { 1987sub cf::client::async {
1732 my ($self, $cb) = @_; 1988 my ($self, $cb) = @_;
1733 1989
1734 my $coro; $coro = async { 1990 my $coro = &Coro::async ($cb);
1735 eval {
1736 $cb->();
1737 };
1738 warn $@ if $@;
1739 };
1740 1991
1741 $coro->on_destroy (sub { 1992 $coro->on_destroy (sub {
1742 delete $self->{_coro}{$coro+0}; 1993 delete $self->{_coro}{$coro+0};
1743 }); 1994 });
1744 1995
1979 open my $fh, "<:utf8", cf::confdir . "/config" 2230 open my $fh, "<:utf8", cf::confdir . "/config"
1980 or return; 2231 or return;
1981 2232
1982 local $/; 2233 local $/;
1983 *CFG = YAML::Syck::Load <$fh>; 2234 *CFG = YAML::Syck::Load <$fh>;
2235
2236 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2237
2238 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2239 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2240
2241 if (exists $CFG{mlockall}) {
2242 eval {
2243 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2244 and die "WARNING: m(un)lockall failed: $!\n";
2245 };
2246 warn $@ if $@;
2247 }
1984} 2248}
1985 2249
1986sub main { 2250sub main {
1987 # we must not ever block the main coroutine 2251 # we must not ever block the main coroutine
1988 local $Coro::idle = sub { 2252 local $Coro::idle = sub {
1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1990 (Coro::unblock_sub {
1991 Event::one_event; 2254 async { Event::one_event };
1992 })->();
1993 }; 2255 };
1994 2256
1995 cfg_load; 2257 cfg_load;
1996 db_load; 2258 db_load;
1997 load_extensions; 2259 load_extensions;
1998 Event::loop; 2260 Event::loop;
1999} 2261}
2000 2262
2001############################################################################# 2263#############################################################################
2002# initialisation 2264# initialisation and cleanup
2265
2266# install some emergency cleanup handlers
2267BEGIN {
2268 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal (
2270 data => WF_AUTOCANCEL,
2271 signal => $signal,
2272 cb => sub {
2273 cf::cleanup "SIG$signal";
2274 },
2275 );
2276 }
2277}
2278
2279sub emergency_save() {
2280 my $freeze_guard = cf::freeze_mainloop;
2281
2282 warn "enter emergency perl save\n";
2283
2284 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously.
2288 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next;
2292 $pl->save;
2293 }
2294 warn "end emergency player save\n";
2295
2296 warn "begin emergency map save\n";
2297 for my $path (keys %cf::MAP) {
2298 my $map = $cf::MAP{$path} or next;
2299 $map->valid or next;
2300 $map->save;
2301 }
2302 warn "end emergency map save\n";
2303 };
2304
2305 warn "leave emergency perl save\n";
2306}
2003 2307
2004sub reload() { 2308sub reload() {
2005 # can/must only be called in main 2309 # can/must only be called in main
2006 if ($Coro::current != $Coro::main) { 2310 if ($Coro::current != $Coro::main) {
2007 warn "can only reload from main coroutine\n"; 2311 warn "can only reload from main coroutine\n";
2008 return; 2312 return;
2009 } 2313 }
2010 2314
2011 warn "reloading..."; 2315 warn "reloading...";
2012 2316
2013 local $FREEZE = 1; 2317 warn "freezing server";
2318 my $guard = freeze_mainloop;
2014 cf::emergency_save; 2319 cf::emergency_save;
2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2015 2324
2016 eval { 2325 eval {
2017 # if anything goes wrong in here, we should simply crash as we already saved 2326 # if anything goes wrong in here, we should simply crash as we already saved
2018 2327
2019 # cancel all watchers 2328 warn "cancel all watchers";
2020 for (Event::all_watchers) { 2329 for (Event::all_watchers) {
2021 $_->cancel if $_->data & WF_AUTOCANCEL; 2330 $_->cancel if $_->data & WF_AUTOCANCEL;
2022 } 2331 }
2023 2332
2024 # cancel all extension coros 2333 warn "cancel all extension coros";
2025 $_->cancel for values %EXT_CORO; 2334 $_->cancel for values %EXT_CORO;
2026 %EXT_CORO = (); 2335 %EXT_CORO = ();
2027 2336
2337 warn "remove commands";
2338 %COMMAND = ();
2339
2340 warn "remove ext commands";
2341 %EXTCMD = ();
2342
2028 # unload all extensions 2343 warn "unload/nuke all extensions";
2029 for (@exts) { 2344 for my $pkg (@EXTS) {
2030 warn "unloading <$_>"; 2345 warn "... unloading $pkg";
2031 unload_extension $_; 2346
2347 if (my $cb = $pkg->can ("unload")) {
2348 eval {
2349 $cb->($pkg);
2350 1
2351 } or warn "$pkg unloaded, but with errors: $@";
2032 } 2352 }
2033 2353
2354 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg;
2356 }
2357
2034 # unload all modules loaded from $LIBDIR 2358 warn "unload all perl modules loaded from $LIBDIR";
2035 while (my ($k, $v) = each %INC) { 2359 while (my ($k, $v) = each %INC) {
2036 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2037 2361
2038 warn "removing <$k>"; 2362 warn "removing <$k>";
2039 delete $INC{$k}; 2363 delete $INC{$k};
2046 } 2370 }
2047 2371
2048 Symbol::delete_package $k; 2372 Symbol::delete_package $k;
2049 } 2373 }
2050 2374
2051 # sync database to disk
2052 cf::db_sync;
2053 IO::AIO::flush;
2054
2055 # get rid of safe::, as good as possible 2375 warn "get rid of safe::, as good as possible";
2056 Symbol::delete_package "safe::$_" 2376 Symbol::delete_package "safe::$_"
2057 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2058 2378
2059 # remove register_script_function callbacks
2060 # TODO
2061
2062 # unload cf.pm "a bit" 2379 warn "unload cf.pm \"a bit\"";
2063 delete $INC{"cf.pm"}; 2380 delete $INC{"cf.pm"};
2064 2381
2065 # don't, removes xs symbols, too, 2382 # don't, removes xs symbols, too,
2066 # and global variables created in xs 2383 # and global variables created in xs
2067 #Symbol::delete_package __PACKAGE__; 2384 #Symbol::delete_package __PACKAGE__;
2068 2385
2069 # reload cf.pm
2070 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2071 require cf; 2387 require cf;
2072 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2073 2389
2074 # load config and database again 2390 warn "load config and database again";
2075 cf::cfg_load; 2391 cf::cfg_load;
2076 cf::db_load; 2392 cf::db_load;
2077 2393
2078 # load extensions
2079 warn "load extensions"; 2394 warn "load extensions";
2080 cf::load_extensions; 2395 cf::load_extensions;
2081 2396
2082 # reattach attachments to objects 2397 warn "reattach attachments to objects/players";
2083 warn "reattach";
2084 _global_reattach; 2398 _global_reattach;
2399 warn "reattach attachments to maps";
2400 reattach $_ for values %MAP;
2085 }; 2401 };
2086 2402
2087 if ($@) { 2403 if ($@) {
2088 warn $@; 2404 warn $@;
2089 warn "error while reloading, exiting."; 2405 warn "error while reloading, exiting.";
2090 exit 1; 2406 exit 1;
2091 } 2407 }
2092 2408
2093 warn "reloaded successfully"; 2409 warn "reloaded";
2094}; 2410};
2095 2411
2096############################################################################# 2412#############################################################################
2097 2413
2098unless ($LINK_MAP) { 2414unless ($LINK_MAP) {
2105 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2106 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2107 2423
2108 # dirty hack because... archetypes are not yet loaded 2424 # dirty hack because... archetypes are not yet loaded
2109 Event->timer ( 2425 Event->timer (
2110 after => 2, 2426 after => 10,
2111 cb => sub { 2427 cb => sub {
2112 $_[0]->w->cancel; 2428 $_[0]->w->cancel;
2113 2429
2114 # provide some exits "home" 2430 # provide some exits "home"
2115 my $exit = cf::object::new "exit"; 2431 my $exit = cf::object::new "exit";
2134 $LINK_MAP->{deny_reset} = 1; 2450 $LINK_MAP->{deny_reset} = 1;
2135 2451
2136 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2137} 2453}
2138 2454
2139register "<global>", __PACKAGE__;
2140
2141register_command "reload" => sub { 2455register_command "reload" => sub {
2142 my ($who, $arg) = @_; 2456 my ($who, $arg) = @_;
2143 2457
2144 if ($who->flag (FLAG_WIZ)) { 2458 if ($who->flag (FLAG_WIZ)) {
2145 $who->message ("start of reload."); 2459 $who->message ("start of reload.");
2154 reentrant => 0, 2468 reentrant => 0,
2155 prio => 0, 2469 prio => 0,
2156 at => $NEXT_TICK || $TICK, 2470 at => $NEXT_TICK || $TICK,
2157 data => WF_AUTOCANCEL, 2471 data => WF_AUTOCANCEL,
2158 cb => sub { 2472 cb => sub {
2159 unless ($FREEZE) { 2473 $NOW = Event::time;
2474
2160 cf::server_tick; # one server iteration 2475 cf::server_tick; # one server iteration
2161 $RUNTIME += $TICK; 2476 $RUNTIME += $TICK;
2162 }
2163
2164 $NEXT_TICK += $TICK; 2477 $NEXT_TICK += $TICK;
2478
2479 $WAIT_FOR_TICK->broadcast;
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2165 2481
2166 # if we are delayed by four ticks or more, skip them all 2482 # if we are delayed by four ticks or more, skip them all
2167 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2168 2484
2169 $TICK_WATCHER->at ($NEXT_TICK); 2485 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines