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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.440 by root, Mon Aug 11 23:23:41 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB 1.6;
23use Coro::Storable; 46use Coro::Storable;
47use Coro::Util ();
24 48
25use JSON::XS 1.4 (); 49use JSON::XS 2.01 ();
26use BDB (); 50use BDB ();
27use Data::Dumper; 51use Data::Dumper;
28use Digest::MD5; 52use Digest::MD5;
29use Fcntl; 53use Fcntl;
30use YAML::Syck (); 54use YAML ();
31use IO::AIO 2.32 (); 55use IO::AIO ();
32use Time::HiRes; 56use Time::HiRes;
33use Compress::LZF; 57use Compress::LZF;
34use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
35 61
36# configure various modules to our taste 62# configure various modules to our taste
37# 63#
38$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 67
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 69
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 71
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
74 96
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 99our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
82 101
102our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 104our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 105our $DB_ENV;
85 106
86our %CFG; 107our %CFG;
87 108
88our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 110our $RUNTIME;
111our $NOW;
90 112
91our %PLAYER; # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 114our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
94 116
95# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 119
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
101 124
102binmode STDOUT; 125binmode STDOUT;
103binmode STDERR; 126binmode STDERR;
104 127
105# read virtual server time, if available 128# read virtual server time, if available
158 181
159The raw value load value from the last tick. 182The raw value load value from the last tick.
160 183
161=item %cf::CFG 184=item %cf::CFG
162 185
163Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 187from wherever your confdir points to.
165 188
166=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
167 190
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 209 $msg .= "\n"
187 unless $msg =~ /\n$/; 210 unless $msg =~ /\n$/;
188 211
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 213
191 utf8::encode $msg;
192 LOG llevError, $msg; 214 LOG llevError, $msg;
193 }; 215 };
194} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
195 232
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 243for my $pkg (qw(
207 cf::global cf::attachable 244 cf::global cf::attachable
208 cf::object cf::object::player 245 cf::object cf::object::player
209 cf::client cf::player 246 cf::client cf::player
210 cf::arch cf::living 247 cf::arch cf::living
248 cf::map cf::mapspace
211 cf::map cf::party cf::region 249 cf::party cf::region
212)) { 250)) {
213 no strict 'refs'; 251 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 253}
216 254
217$Event::DIED = sub { 255$EV::DIED = sub {
218 warn "error in event callback: @_"; 256 warn "error in event callback: @_";
219}; 257};
220 258
221############################################################################# 259#############################################################################
222 260
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 283 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 284 $d
247 } || "[unable to dump $_[0]: '$@']"; 285 } || "[unable to dump $_[0]: '$@']";
248} 286}
249 287
250=item $ref = cf::from_json $json 288=item $ref = cf::decode_json $json
251 289
252Converts a JSON string into the corresponding perl data structure. 290Converts a JSON string into the corresponding perl data structure.
253 291
254=item $json = cf::to_json $ref 292=item $json = cf::encode_json $ref
255 293
256Converts a perl data structure into its JSON representation. 294Converts a perl data structure into its JSON representation.
257 295
258=cut 296=cut
259 297
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 299
262sub to_json ($) { $json_coder->encode ($_[0]) } 300sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 301sub decode_json($) { $json_coder->decode ($_[0]) }
264 302
265=item cf::lock_wait $string 303=item cf::lock_wait $string
266 304
267Wait until the given lock is available. See cf::lock_acquire. 305Wait until the given lock is available. See cf::lock_acquire.
268 306
271Wait until the given lock is available and then acquires it and returns 309Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 310a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 311for example when the coroutine gets canceled), the lock is automatically
274returned. 312returned.
275 313
314Locks are *not* recursive, locking from the same coro twice results in a
315deadlocked coro.
316
276Lock names should begin with a unique identifier (for example, cf::map::find 317Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 318uses map_find and cf::map::load uses map_load).
278 319
279=item $locked = cf::lock_active $string 320=item $locked = cf::lock_active $string
280 321
281Return true if the lock is currently active, i.e. somebody has locked it. 322Return true if the lock is currently active, i.e. somebody has locked it.
282 323
283=cut 324=cut
284 325
285our %LOCK; 326our %LOCK;
327our %LOCKER;#d#
286 328
287sub lock_wait($) { 329sub lock_wait($) {
288 my ($key) = @_; 330 my ($key) = @_;
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
289 336
290 # wait for lock, if any 337 # wait for lock, if any
291 while ($LOCK{$key}) { 338 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 339 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 340 Coro::schedule;
299 346
300 # wait, to be sure we are not locked 347 # wait, to be sure we are not locked
301 lock_wait $key; 348 lock_wait $key;
302 349
303 $LOCK{$key} = []; 350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
304 352
305 Coro::guard { 353 Coro::guard {
354 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 355 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 356 $_->ready for @{ delete $LOCK{$key} };
308 } 357 }
309} 358}
310 359
313 362
314 ! ! $LOCK{$key} 363 ! ! $LOCK{$key}
315} 364}
316 365
317sub freeze_mainloop { 366sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 367 tick_inhibit_inc;
319 368
320 my $guard = Coro::guard { 369 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 370}
322 }; 371
323 $TICK_WATCHER->stop; 372=item cf::periodic $interval, $cb
324 $guard 373
374Like EV::periodic, but randomly selects a starting point so that the actions
375get spread over timer.
376
377=cut
378
379sub periodic($$) {
380 my ($interval, $cb) = @_;
381
382 my $start = rand List::Util::min 180, $interval;
383
384 EV::periodic $start, $interval, 0, $cb
325} 385}
326 386
327=item cf::get_slot $time[, $priority[, $name]] 387=item cf::get_slot $time[, $priority[, $name]]
328 388
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 389Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 400our @SLOT_QUEUE;
341our $SLOT_QUEUE; 401our $SLOT_QUEUE;
342 402
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 403$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 404$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager");
406
345 my $signal = new Coro::Signal; 407 my $signal = new Coro::Signal;
346 408
347 while () { 409 while () {
348 next_job: 410 next_job:
349 my $avail = cf::till_tick; 411 my $avail = cf::till_tick;
357 } 419 }
358 } 420 }
359 } 421 }
360 422
361 if (@SLOT_QUEUE) { 423 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 424 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 425 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 426 $signal->wait;
365 } else { 427 } else {
366 Coro::schedule; 428 Coro::schedule;
367 } 429 }
368 } 430 }
369}; 431};
370 432
371sub get_slot($;$$) { 433sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main;
435
372 my ($time, $pri, $name) = @_; 436 my ($time, $pri, $name) = @_;
373 437
374 $time = $TICK * .6 if $time > $TICK * .6; 438 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 439 my $sig = new Coro::Signal;
376 440
390 454
391BEGIN { *async = \&Coro::async_pool } 455BEGIN { *async = \&Coro::async_pool }
392 456
393=item cf::sync_job { BLOCK } 457=item cf::sync_job { BLOCK }
394 458
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 459The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 460is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 461partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 462acceptable.
399 463
400If it must be done, put the blocking parts into C<sync_job>. This will run 464If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 465the given BLOCK in another coroutine while waiting for the result. The
406 470
407sub sync_job(&) { 471sub sync_job(&) {
408 my ($job) = @_; 472 my ($job) = @_;
409 473
410 if ($Coro::current == $Coro::main) { 474 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 475 my $time = EV::time;
412 476
413 # this is the main coro, too bad, we have to block 477 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 478 # till the operation succeeds, freezing the server :/
415 479
416 # TODO: use suspend/resume instead 480 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 481
418 my $freeze_guard = freeze_mainloop; 482 my $freeze_guard = freeze_mainloop;
419 483
420 my $busy = 1; 484 my $busy = 1;
421 my @res; 485 my @res;
422 486
423 (async { 487 (async {
488 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 489 @res = eval { $job->() };
425 warn $@ if $@; 490 warn $@ if $@;
426 undef $busy; 491 undef $busy;
427 })->prio (Coro::PRIO_MAX); 492 })->prio (Coro::PRIO_MAX);
428 493
429 while ($busy) { 494 while ($busy) {
430 Coro::cede or Event::one_event; 495 if (Coro::nready) {
496 Coro::cede_notself;
497 } else {
498 EV::loop EV::LOOP_ONESHOT;
431 } 499 }
500 }
432 501
433 $time = Event::time - $time; 502 my $time = EV::time - $time;
434 503
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 504 $TICK_START += $time; # do not account sync jobs to server load
439 505
440 wantarray ? @res : $res[0] 506 wantarray ? @res : $res[0]
441 } else { 507 } else {
442 # we are in another coroutine, how wonderful, everything just works 508 # we are in another coroutine, how wonderful, everything just works
443 509
468=item fork_call { }, $args 534=item fork_call { }, $args
469 535
470Executes the given code block with the given arguments in a seperate 536Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 537process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 538Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 539never block itself or use any form of event handling.
474 540
475=cut 541=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 542
486sub fork_call(&@) { 543sub fork_call(&@) {
487 my ($cb, @args) = @_; 544 my ($cb, @args) = @_;
488 545
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 546 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 547 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 548 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 549
494 if (my $pid = fork) { 550 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 551 reset_signals;
508 local $SIG{__WARN__}; 552 &$cb
509 local $SIG{__DIE__}; 553 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 554
516 eval { 555 wantarray ? @res : $res[-1]
517 close $fh1; 556}
518 557
519 my @res = eval { $cb->(@args) }; 558=item $coin = coin_from_name $name
520 559
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 560=cut
522 close $fh2;
523 };
524 561
525 warn $@ if $@; 562our %coin_alias = (
526 _exit 0; 563 "silver" => "silvercoin",
527 } 564 "silvercoin" => "silvercoin",
565 "silvercoins" => "silvercoin",
566 "gold" => "goldcoin",
567 "goldcoin" => "goldcoin",
568 "goldcoins" => "goldcoin",
569 "platinum" => "platinacoin",
570 "platinumcoin" => "platinacoin",
571 "platinumcoins" => "platinacoin",
572 "platina" => "platinacoin",
573 "platinacoin" => "platinacoin",
574 "platinacoins" => "platinacoin",
575 "royalty" => "royalty",
576 "royalties" => "royalty",
577);
578
579sub coin_from_name($) {
580 $coin_alias{$_[0]}
581 ? cf::arch::find $coin_alias{$_[0]}
582 : undef
528} 583}
529 584
530=item $value = cf::db_get $family => $key 585=item $value = cf::db_get $family => $key
531 586
532Returns a single value from the environment database. 587Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 589=item cf::db_put $family => $key => $value
535 590
536Stores the given C<$value> in the family. It can currently store binary 591Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 592data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 593
594=item $db = cf::db_table "name"
595
596Create and/or open a new database table. The string must not be "db" and must be unique
597within each server.
598
539=cut 599=cut
600
601sub db_table($) {
602 my ($name) = @_;
603 my $db = BDB::db_create $DB_ENV;
604
605 eval {
606 $db->set_flags (BDB::CHKSUM);
607
608 utf8::encode $name;
609 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
610 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
611 cf::cleanup "db_open(db): $!" if $!;
612 };
613 cf::cleanup "db_open(db): $@" if $@;
614
615 $db
616}
540 617
541our $DB; 618our $DB;
542 619
543sub db_init { 620sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 621 cf::sync_job {
548 eval { 622 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 623 };
558} 624}
559 625
560sub db_get($$) { 626sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 627 my $key = "$_[0]/$_[1]";
562 628
612 if (1) { 678 if (1) {
613 $md5 = 679 $md5 =
614 join "\x00", 680 join "\x00",
615 $processversion, 681 $processversion,
616 map { 682 map {
617 Coro::cede; 683 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 684 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 685 } 0.. $#$src;
620 686
621 687
622 my $dbmd5 = db_get cache => "$id/md5"; 688 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 732attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 733to it. All such attachable objects support the following methods.
668 734
669In the following description, CLASS can be any of C<global>, C<object> 735In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 736C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 737Deliantra).
672 738
673=over 4 739=over 4
674 740
675=item $attachable->attach ($attachment, key => $value...) 741=item $attachable->attach ($attachment, key => $value...)
676 742
958 } 1024 }
959 1025
960 0 1026 0
961} 1027}
962 1028
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1030
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1031=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1032
967Generate an object-specific event with the given arguments. 1033Generate an object-specific event with the given arguments.
968 1034
974 1040
975=cut 1041=cut
976 1042
977############################################################################# 1043#############################################################################
978# object support 1044# object support
979#
980 1045
1046sub _object_equal($$);
1047sub _object_equal($$) {
1048 my ($a, $b) = @_;
1049
1050 return 0 unless (ref $a) eq (ref $b);
1051
1052 if ("HASH" eq ref $a) {
1053 my @ka = keys %$a;
1054 my @kb = keys %$b;
1055
1056 return 0 if @ka != @kb;
1057
1058 for (0 .. $#ka) {
1059 return 0 unless $ka[$_] eq $kb[$_];
1060 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1061 }
1062
1063 } elsif ("ARRAY" eq ref $a) {
1064
1065 return 0 if @$a != @$b;
1066
1067 for (0 .. $#$a) {
1068 return 0 unless _object_equal $a->[$_], $b->[$_];
1069 }
1070
1071 } elsif ($a ne $b) {
1072 return 0;
1073 }
1074
1075 1
1076}
1077
1078our $SLOW_MERGES;#d#
981sub _can_merge { 1079sub _can_merge {
982 my ($ob1, $ob2) = @_; 1080 my ($ob1, $ob2) = @_;
983 1081
984 local $Storable::canonical = 1; 1082 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1083
988 $fob1 eq $fob2 1084 # we do the slow way here
1085 return _object_equal $ob1, $ob2
989} 1086}
990 1087
991sub reattach { 1088sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1089 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1090 my ($obj) = @_;
1015cf::attachable->attach ( 1112cf::attachable->attach (
1016 prio => -1000000, 1113 prio => -1000000,
1017 on_instantiate => sub { 1114 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1115 my ($obj, $data) = @_;
1019 1116
1020 $data = from_json $data; 1117 $data = decode_json $data;
1021 1118
1022 for (@$data) { 1119 for (@$data) {
1023 my ($name, $args) = @$_; 1120 my ($name, $args) = @$_;
1024 1121
1025 $obj->attach ($name, %{$args || {} }); 1122 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1138sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1139 my ($filename, $rdata, $objs) = @_;
1043 1140
1044 sync_job { 1141 sync_job {
1045 if (length $$rdata) { 1142 if (length $$rdata) {
1143 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1144 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1145 $decname, length $$rdata, scalar @$objs;
1048 1146
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1148 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1150 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1151 aio_close $fh;
1054 1152
1055 if (@$objs) { 1153 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1157 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1159 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1160 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1161 }
1064 } else { 1162 } else {
1065 aio_unlink "$filename.pst"; 1163 aio_unlink "$filename.pst";
1066 } 1164 }
1071 } 1169 }
1072 } else { 1170 } else {
1073 aio_unlink $filename; 1171 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1172 aio_unlink "$filename.pst";
1075 } 1173 }
1076 } 1174 };
1077} 1175}
1078 1176
1079sub object_freezer_as_string { 1177sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1178 my ($rdata, $objs) = @_;
1081 1179
1093 or return; 1191 or return;
1094 1192
1095 unless (aio_stat "$filename.pst") { 1193 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1194 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1195 or return;
1196
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1197 my $st = eval { Coro::Storable::thaw $av };
1198 $av = $st->{objs};
1099 } 1199 }
1100 1200
1201 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1202 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1203 $decname, length $data, scalar @{$av || []};
1204
1103 return ($data, $av); 1205 ($data, $av)
1104} 1206}
1105 1207
1106=head2 COMMAND CALLBACKS 1208=head2 COMMAND CALLBACKS
1107 1209
1108=over 4 1210=over 4
1181 my ($pl, $buf) = @_; 1283 my ($pl, $buf) = @_;
1182 1284
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1285 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1286
1185 if (ref $msg) { 1287 if (ref $msg) {
1288 my ($type, $reply, @payload) =
1289 "ARRAY" eq ref $msg
1290 ? @$msg
1291 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1292
1293 my @reply;
1294
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1295 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1296 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1297 }
1298
1299 $pl->ext_reply ($reply, @reply)
1300 if $reply;
1301
1191 } else { 1302 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1303 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1304 }
1194 1305
1195 cf::override; 1306 cf::override;
1248 my $msg = $@ ? "$v->{path}: $@\n" 1359 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1360 : "$v->{base}: extension inactive.\n";
1250 1361
1251 if (exists $v->{meta}{mandatory}) { 1362 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1363 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1364 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1365 }
1256 1366
1257 warn $msg; 1367 warn $msg;
1258 } 1368 }
1259 1369
1284use Coro::AIO; 1394use Coro::AIO;
1285 1395
1286=head3 cf::player 1396=head3 cf::player
1287 1397
1288=over 4 1398=over 4
1399
1400=item cf::player::num_playing
1401
1402Returns the official number of playing players, as per the Crossfire metaserver rules.
1403
1404=cut
1405
1406sub num_playing {
1407 scalar grep
1408 $_->ob->map
1409 && !$_->hidden
1410 && !$_->ob->flag (cf::FLAG_WIZ),
1411 cf::player::list
1412}
1289 1413
1290=item cf::player::find $login 1414=item cf::player::find $login
1291 1415
1292Returns the given player object, loading it if necessary (might block). 1416Returns the given player object, loading it if necessary (might block).
1293 1417
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1453 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1454 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1455 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1456 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1457
1334 my $pl = load_pl path $login 1458 my $f = new_from_file cf::object::thawer path $login
1335 or return; 1459 or return;
1460
1461 my $pl = cf::player::load_pl $f
1462 or return;
1463
1464 local $cf::PLAYER_LOADING{$login} = $pl;
1465 $f->resolve_delayed_derefs;
1336 $cf::PLAYER{$login} = $pl 1466 $cf::PLAYER{$login} = $pl
1337 } 1467 }
1338 } 1468 }
1339} 1469}
1340 1470
1349 return if $pl->{deny_save}; 1479 return if $pl->{deny_save};
1350 1480
1351 aio_mkdir playerdir $pl, 0770; 1481 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1482 $pl->{last_save} = $cf::RUNTIME;
1353 1483
1484 cf::get_slot 0.01;
1485
1354 $pl->save_pl ($path); 1486 $pl->save_pl ($path);
1355 Coro::cede; 1487 cf::cede_to_tick;
1356} 1488}
1357 1489
1358sub new($) { 1490sub new($) {
1359 my ($login) = @_; 1491 my ($login) = @_;
1360 1492
1366 $cf::PLAYER{$login} = $self; 1498 $cf::PLAYER{$login} = $self;
1367 1499
1368 $self 1500 $self
1369} 1501}
1370 1502
1503=item $player->send_msg ($channel, $msg, $color, [extra...])
1504
1505=cut
1506
1507sub send_msg {
1508 my $ns = shift->ns
1509 or return;
1510 $ns->send_msg (@_);
1511}
1512
1371=item $pl->quit_character 1513=item $pl->quit_character
1372 1514
1373Nukes the player without looking back. If logged in, the connection will 1515Nukes the player without looking back. If logged in, the connection will
1374be destroyed. May block for a long time. 1516be destroyed. May block for a long time.
1375 1517
1383 $pl->{deny_save} = 1; 1525 $pl->{deny_save} = 1;
1384 $pl->password ("*"); # this should lock out the player until we nuked the dir 1526 $pl->password ("*"); # this should lock out the player until we nuked the dir
1385 1527
1386 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1387 $pl->deactivate; 1529 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1388 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1532 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1389 $pl->ns->destroy if $pl->ns; 1533 $pl->ns->destroy if $pl->ns;
1390 1534
1391 my $path = playerdir $pl; 1535 my $path = playerdir $pl;
1392 my $temp = "$path~$cf::RUNTIME~deleting~"; 1536 my $temp = "$path~$cf::RUNTIME~deleting~";
1428 or return []; 1572 or return [];
1429 1573
1430 my @logins; 1574 my @logins;
1431 1575
1432 for my $login (@$dirs) { 1576 for my $login (@$dirs) {
1577 my $path = path $login;
1578
1579 # a .pst is a dead give-away for a valid player
1580 # if no pst file found, open and chekc for blocked users
1581 if (aio_stat "$path.pst") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1582 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1583 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1584 $buf !~ /^password -------------$/m or next; # official not-valid tag
1585 }
1436 1586
1437 utf8::decode $login; 1587 utf8::decode $login;
1438 push @logins, $login; 1588 push @logins, $login;
1439 } 1589 }
1440 1590
1473 1623
1474Expand crossfire pod fragments into protocol xml. 1624Expand crossfire pod fragments into protocol xml.
1475 1625
1476=cut 1626=cut
1477 1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1478sub expand_cfpod { 1639sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1640 my ($self, $pod) = @_;
1480 1641
1481 # escape & and < 1642 my $xml;
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484 1643
1485 # this is buggy, it needs to properly take care of nested <'s 1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1486 1647
1487 1 while 1648 $group =~ s/&/&amp;/g;
1488 # replace B<>, I<>, U<> etc. 1649 $group =~ s/</&lt;/g;
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1650
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1651 $xml .= $group;
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1652 } elsif ($pod =~ m%\G
1492 # replace G<male|female> tags 1653 ([BCGHITU])
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1654 <
1494 $self->gender ? $2 : $1 1655 (?:
1495 }ge 1656 ([^<>]*) (?{ $group = $^N })
1496 # replace H<hint text> 1657 | < $interior >
1497 || s{H<([^\>]*)>} 1658 )
1659 >
1660 %gcsx
1498 { 1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "") 1681 "")
1502 [$self->{hintmode}] 1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1503 }ge; 1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1504 1693
1694 for ($xml) {
1505 # create single paragraphs (very hackish) 1695 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g; 1696 s/(?<=\S)\n(?=\w)/ /g;
1507 1697
1508 # compress some whitespace 1698 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends 1699 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines 1700 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines 1701 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines 1702 s/\n+$//; # ending lines
1703 }
1513 1704
1514 $_ 1705 $xml
1515} 1706}
1707
1708no re 'eval';
1516 1709
1517sub hintmode { 1710sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1712 $_[0]{hintmode}
1520} 1713}
1521 1714
1522=item $player->ext_reply ($msgid, %msg) 1715=item $player->ext_reply ($msgid, @msg)
1523 1716
1524Sends an ext reply to the player. 1717Sends an ext reply to the player.
1525 1718
1526=cut 1719=cut
1527 1720
1528sub ext_reply($$%) { 1721sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1722 my ($self, $id, @msg) = @_;
1530 1723
1531 $msg{msgid} = $id; 1724 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1725}
1534 1726
1535=item $player->ext_event ($type, %msg) 1727=item $player->ext_msg ($type, @msg)
1536 1728
1537Sends an ext event to the client. 1729Sends an ext event to the client.
1538 1730
1539=cut 1731=cut
1540 1732
1541sub ext_event($$%) { 1733sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1734 my ($self, $type, @msg) = @_;
1543 1735
1544 $self->ns->ext_event ($type, %msg); 1736 $self->ns->ext_msg ($type, @msg);
1545} 1737}
1546 1738
1547=head3 cf::region 1739=head3 cf::region
1548 1740
1549=over 4 1741=over 4
1593our $MAX_RESET = 3600; 1785our $MAX_RESET = 3600;
1594our $DEFAULT_RESET = 3000; 1786our $DEFAULT_RESET = 3000;
1595 1787
1596sub generate_random_map { 1788sub generate_random_map {
1597 my ($self, $rmp) = @_; 1789 my ($self, $rmp) = @_;
1790
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792
1598 # mit "rum" bekleckern, nicht 1793 # mit "rum" bekleckern, nicht
1599 $self->_create_random_map ( 1794 $self->_create_random_map (
1600 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1601 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1602 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1724 1919
1725# the temporary/swap location 1920# the temporary/swap location
1726sub save_path { 1921sub save_path {
1727 my ($self) = @_; 1922 my ($self) = @_;
1728 1923
1729 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1924 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1730 "$TMPDIR/$path.map" 1925 "$TMPDIR/$path.map"
1731} 1926}
1732 1927
1733# the unique path, undef == no special unique path 1928# the unique path, undef == no special unique path
1734sub uniq_path { 1929sub uniq_path {
1735 my ($self) = @_; 1930 my ($self) = @_;
1736 1931
1737 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1738 "$UNIQUEDIR/$path" 1933 "$UNIQUEDIR/$path"
1739} 1934}
1740 1935
1741# and all this just because we cannot iterate over 1936# and all this just because we cannot iterate over
1742# all maps in C++... 1937# all maps in C++...
1765 1960
1766sub load_header_from($) { 1961sub load_header_from($) {
1767 my ($self, $path) = @_; 1962 my ($self, $path) = @_;
1768 1963
1769 utf8::encode $path; 1964 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1965 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1966 or return;
1967
1968 $self->_load_header ($f)
1969 or return;
1970
1971 local $MAP_LOADING{$self->{path}} = $self;
1972 $f->resolve_delayed_derefs;
1775 1973
1776 $self->{load_path} = $path; 1974 $self->{load_path} = $path;
1777 1975
1778 1 1976 1
1779} 1977}
1833sub find { 2031sub find {
1834 my ($path, $origin) = @_; 2032 my ($path, $origin) = @_;
1835 2033
1836 $path = normalise $path, $origin && $origin->path; 2034 $path = normalise $path, $origin && $origin->path;
1837 2035
2036 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 2037 cf::lock_wait "map_find:$path";
1839 2038
1840 $cf::MAP{$path} || do { 2039 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1841 my $guard = cf::lock_acquire "map_find:$path"; 2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
1842 my $map = new_from_path cf::map $path 2043 my $map = new_from_path cf::map $path
1843 or return; 2044 or return;
1844 2045
1845 $map->{last_save} = $cf::RUNTIME; 2046 $map->{last_save} = $cf::RUNTIME;
1846 2047
1848 or return; 2049 or return;
1849 2050
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2051 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 2052 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 2053 #$cf::WAIT_FOR_TICK->wait;
2054 undef $guard2;
2055 undef $guard1;
1853 $map->reset; 2056 $map->reset;
1854 undef $guard;
1855 return find $path; 2057 return find $path;
1856 } 2058 }
1857 2059
1858 $cf::MAP{$path} = $map 2060 $cf::MAP{$path} = $map
1859 } 2061 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 2070 local $self->{deny_reset} = 1; # loading can take a long time
1869 2071
1870 my $path = $self->{path}; 2072 my $path = $self->{path};
1871 2073
1872 { 2074 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 2075 my $guard = cf::lock_acquire "map_data:$path";
1874 2076
2077 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 2078 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 2079
1877 $self->in_memory (cf::MAP_LOADING); 2080 $self->in_memory (cf::MAP_LOADING);
1878 2081
1879 $self->alloc; 2082 $self->alloc;
1880 2083
1881 $self->pre_load; 2084 $self->pre_load;
1882 Coro::cede; 2085 cf::cede_to_tick;
1883 2086
2087 my $f = new_from_file cf::object::thawer $self->{load_path};
2088 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2089 $self->_load_objects ($f)
1885 or return; 2090 or return;
1886 2091
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2092 $self->post_load_original
1888 if delete $self->{load_original}; 2093 if delete $self->{load_original};
1889 2094
1890 if (my $uniq = $self->uniq_path) { 2095 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2096 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2097 unless (aio_stat $uniq) {
2098 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2099 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2100 $self->_load_objects ($f);
2101 $f->resolve_delayed_derefs;
2102 }
1895 } 2103 }
1896 } 2104 }
1897 2105
1898 Coro::cede; 2106 $f->resolve_delayed_derefs;
2107
2108 cf::cede_to_tick;
1899 # now do the right thing for maps 2109 # now do the right thing for maps
1900 $self->link_multipart_objects; 2110 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2111 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2112 unless $self->difficulty;
1903 Coro::cede; 2113 cf::cede_to_tick;
1904 2114
1905 unless ($self->{deny_activate}) { 2115 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2116 $self->decay_objects;
1907 $self->fix_auto_apply; 2117 $self->fix_auto_apply;
1908 $self->update_buttons; 2118 $self->update_buttons;
1909 Coro::cede; 2119 cf::cede_to_tick;
1910 $self->set_darkness_map; 2120 $self->set_darkness_map;
1911 Coro::cede; 2121 cf::cede_to_tick;
1912 $self->activate; 2122 $self->activate;
1913 } 2123 }
1914 2124
2125 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME);
2127
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2128 $self->in_memory (cf::MAP_ACTIVE);
1916 } 2129 }
1917 2130
1918 $self->post_load; 2131 $self->post_load;
1919} 2132}
1920 2133
1929 2142
1930 $self 2143 $self
1931} 2144}
1932 2145
1933# find and load all maps in the 3x3 area around a map 2146# find and load all maps in the 3x3 area around a map
1934sub load_diag { 2147sub load_neighbours {
1935 my ($map) = @_; 2148 my ($map) = @_;
1936 2149
1937 my @diag; # diagonal neighbours 2150 my @neigh; # diagonal neighbours
1938 2151
1939 for (0 .. 3) { 2152 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2153 my $neigh = $map->tile_path ($_)
1941 or next; 2154 or next;
1942 $neigh = find $neigh, $map 2155 $neigh = find $neigh, $map
1943 or next; 2156 or next;
1944 $neigh->load; 2157 $neigh->load;
1945 2158
2159 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2160 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2161 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2162 }
1949 2163
1950 for (@diag) { 2164 for (grep defined $_->[0], @neigh) {
2165 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2166 my $neigh = find $path, $origin
1952 or next; 2167 or next;
1953 $neigh->load; 2168 $neigh->load;
1954 } 2169 }
1955} 2170}
1956 2171
1961} 2176}
1962 2177
1963sub do_load_sync { 2178sub do_load_sync {
1964 my ($map) = @_; 2179 my ($map) = @_;
1965 2180
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main;
2183
1966 cf::sync_job { $map->load }; 2184 cf::sync_job { $map->load };
1967} 2185}
1968 2186
1969our %MAP_PREFETCH; 2187our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2188our $MAP_PREFETCHER = undef;
1971 2189
1972sub find_async { 2190sub find_async {
1973 my ($path, $origin) = @_; 2191 my ($path, $origin, $load) = @_;
1974 2192
1975 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
1976 2194
1977 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1979 } 2197 }
1980 2198
1981 undef $MAP_PREFETCH{$path}; 2199 $MAP_PREFETCH{$path} |= $load;
2200
1982 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
2202 $Coro::current->{desc} = "map prefetcher";
2203
1983 while (%MAP_PREFETCH) { 2204 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2205 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2206 if (my $map = find $k) {
1986 $map->load; 2207 $map->load if $v;
1987 } 2208 }
1988 2209
1989 delete $MAP_PREFETCH{$path}; 2210 delete $MAP_PREFETCH{$k};
1990 } 2211 }
1991 } 2212 }
1992 undef $MAP_PREFETCHER; 2213 undef $MAP_PREFETCHER;
1993 }; 2214 };
1994 $MAP_PREFETCHER->prio (6); 2215 $MAP_PREFETCHER->prio (6);
1997} 2218}
1998 2219
1999sub save { 2220sub save {
2000 my ($self) = @_; 2221 my ($self) = @_;
2001 2222
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2224
2004 $self->{last_save} = $cf::RUNTIME; 2225 $self->{last_save} = $cf::RUNTIME;
2005 2226
2006 return unless $self->dirty; 2227 return unless $self->dirty;
2007 2228
2013 return if $self->{deny_save}; 2234 return if $self->{deny_save};
2014 2235
2015 local $self->{last_access} = $self->last_access;#d# 2236 local $self->{last_access} = $self->last_access;#d#
2016 2237
2017 cf::async { 2238 cf::async {
2239 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2240 $_->contr->save for $self->players;
2019 }; 2241 };
2242
2243 cf::get_slot 0.02;
2020 2244
2021 if ($uniq) { 2245 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2023 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2247 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2024 } else { 2248 } else {
2030 my ($self) = @_; 2254 my ($self) = @_;
2031 2255
2032 # save first because save cedes 2256 # save first because save cedes
2033 $self->save; 2257 $self->save;
2034 2258
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2260
2037 return if $self->players; 2261 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2039 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2040 2264
2265 $self->in_memory (cf::MAP_SWAPPED);
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2269 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2270}
2044 2271
2045sub reset_at { 2272sub reset_at {
2046 my ($self) = @_; 2273 my ($self) = @_;
2047 2274
2079 if $uniq; 2306 if $uniq;
2080 } 2307 }
2081 2308
2082 delete $cf::MAP{$self->path}; 2309 delete $cf::MAP{$self->path};
2083 2310
2311 $self->deactivate;
2312 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2313 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2314
2088 $self->unlink_save; 2315 $self->unlink_save;
2089 $self->destroy; 2316 $self->destroy;
2090} 2317}
2091 2318
2092my $nuke_counter = "aaaa"; 2319my $nuke_counter = "aaaa";
2093 2320
2094sub nuke { 2321sub nuke {
2095 my ($self) = @_; 2322 my ($self) = @_;
2096 2323
2324 {
2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2326
2097 delete $cf::MAP{$self->path}; 2327 delete $cf::MAP{$self->path};
2098 2328
2099 $self->unlink_save; 2329 $self->unlink_save;
2100 2330
2101 bless $self, "cf::map"; 2331 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2332 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2333 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2334 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2335 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2336
2107 $cf::MAP{$self->path} = $self; 2337 $cf::MAP{$self->path} = $self;
2338 }
2108 2339
2109 $self->reset; # polite request, might not happen 2340 $self->reset; # polite request, might not happen
2110} 2341}
2111 2342
2112=item $maps = cf::map::tmp_maps 2343=item $maps = cf::map::tmp_maps
2154 2385
2155sub unique_maps() { 2386sub unique_maps() {
2156 [ 2387 [
2157 map { 2388 map {
2158 utf8::decode $_; 2389 utf8::decode $_;
2159 /\.map$/ 2390 s/\.map$//; # TODO future compatibility hack
2391 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2392 ? ()
2160 ? normalise $_ 2393 : normalise $_
2161 : ()
2162 } @{ aio_readdir $UNIQUEDIR or [] } 2394 } @{ aio_readdir $UNIQUEDIR or [] }
2163 ] 2395 ]
2164} 2396}
2165 2397
2166package cf;
2167
2168=back 2398=back
2169 2399
2170=head3 cf::object 2400=head3 cf::object
2171 2401
2172=cut 2402=cut
2175 2405
2176=over 4 2406=over 4
2177 2407
2178=item $ob->inv_recursive 2408=item $ob->inv_recursive
2179 2409
2180Returns the inventory of the object _and_ their inventories, recursively. 2410Returns the inventory of the object I<and> their inventories, recursively,
2411but I<not> the object itself.
2181 2412
2182=cut 2413=cut
2183 2414
2184sub inv_recursive_; 2415sub inv_recursive_;
2185sub inv_recursive_ { 2416sub inv_recursive_ {
2188 2419
2189sub inv_recursive { 2420sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2421 inv_recursive_ inv $_[0]
2191} 2422}
2192 2423
2424=item $ref = $ob->ref
2425
2426Creates and returns a persistent reference to an object that can be stored as a string.
2427
2428=item $ob = cf::object::deref ($refstring)
2429
2430returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2431even if the object actually exists. May block.
2432
2433=cut
2434
2435sub deref {
2436 my ($ref) = @_;
2437
2438 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2439 my ($uuid, $name) = ($1, $2);
2440 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2441 or return;
2442 $pl->ob->uuid eq $uuid
2443 or return;
2444
2445 $pl->ob
2446 } else {
2447 warn "$ref: cannot resolve object reference\n";
2448 undef
2449 }
2450}
2451
2193package cf; 2452package cf;
2194 2453
2195=back 2454=back
2196 2455
2197=head3 cf::object::player 2456=head3 cf::object::player
2203Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2462Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2204can be C<undef>. Does the right thing when the player is currently in a 2463can be C<undef>. Does the right thing when the player is currently in a
2205dialogue with the given NPC character. 2464dialogue with the given NPC character.
2206 2465
2207=cut 2466=cut
2467
2468our $SAY_CHANNEL = {
2469 id => "say",
2470 title => "Map",
2471 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2473};
2474
2475our $CHAT_CHANNEL = {
2476 id => "chat",
2477 title => "Chat",
2478 reply => "chat ",
2479 tooltip => "Player chat and shouts, global to the server.",
2480};
2208 2481
2209# rough implementation of a future "reply" method that works 2482# rough implementation of a future "reply" method that works
2210# with dialog boxes. 2483# with dialog boxes.
2211#TODO: the first argument must go, split into a $npc->reply_to ( method 2484#TODO: the first argument must go, split into a $npc->reply_to ( method
2212sub cf::object::player::reply($$$;$) { 2485sub cf::object::player::reply($$$;$) {
2219 2492
2220 } else { 2493 } else {
2221 my $pl = $self->contr; 2494 my $pl = $self->contr;
2222 2495
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2496 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2497 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2498 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2499
2232 } else { 2500 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2501 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2502 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2235 } 2503 }
2236 } 2504 }
2505}
2506
2507=item $object->send_msg ($channel, $msg, $color, [extra...])
2508
2509=cut
2510
2511sub cf::object::send_msg {
2512 my $pl = shift->contr
2513 or return;
2514 $pl->send_msg (@_);
2237} 2515}
2238 2516
2239=item $player_object->may ("access") 2517=item $player_object->may ("access")
2240 2518
2241Returns wether the given player is authorized to access resource "access" 2519Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2598 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2599 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2600 if $x <=0 && $y <= 0;
2323 2601
2324 $map->load; 2602 $map->load;
2325 $map->load_diag; 2603 $map->load_neighbours;
2326 2604
2327 return unless $self->contr->active; 2605 return unless $self->contr->active;
2328 $self->activate_recursive; 2606 $self->activate_recursive;
2329 2607
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2337her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2338that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
2339the new (success) or old (failed) map position. In either case, $done will 2617the new (success) or old (failed) map position. In either case, $done will
2340be called at the end of this process. 2618be called at the end of this process.
2341 2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2622
2342=cut 2623=cut
2343 2624
2344our $GOTOGEN; 2625our $GOTOGEN;
2345 2626
2346sub cf::object::player::goto { 2627sub cf::object::player::goto {
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2632
2352 $self->enter_link; 2633 $self->enter_link;
2353 2634
2354 (async { 2635 (async {
2636 $Coro::current->{desc} = "player::goto $path $x $y";
2637
2638 # *tag paths override both path and x|y
2639 if ($path =~ /^\*(.*)$/) {
2640 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2641 my $ob = $obs[rand @obs];
2642
2643 # see if we actually can go there
2644 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2645 $ob = $obs[rand @obs];
2646 } else {
2647 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 }
2649 # else put us there anyways for now #d#
2650
2651 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2652 } else {
2653 ($path, $x, $y) = (undef, undef, undef);
2654 }
2655 }
2656
2355 my $map = eval { 2657 my $map = eval {
2356 my $map = cf::map::find $path; 2658 my $map = defined $path ? cf::map::find $path : undef;
2357 2659
2358 if ($map) { 2660 if ($map) {
2359 $map = $map->customise_for ($self); 2661 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2662 $map = $check->($map) if $check && $map;
2361 } else { 2663 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2665 }
2364 2666
2365 $map 2667 $map
2366 }; 2668 };
2367 2669
2403} 2705}
2404 2706
2405sub prepare_random_map { 2707sub prepare_random_map {
2406 my ($exit) = @_; 2708 my ($exit) = @_;
2407 2709
2408 my $guard = cf::lock_acquire "exit_prepare:$exit";
2409
2410 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2411 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2412 # that depends on the exit object 2712 # that depends on the exit object
2413 2713
2414 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
2416 if ($exit->map) { 2716 if ($exit->map) {
2417 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2418 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2419 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2420 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2421 } 2723 }
2422 2724
2423 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2424 2726
2425 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2426 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2428 2730
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2431 undef $fh; 2733 undef $fh;
2432 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2433 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2434 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2435 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2436 } 2742 }
2437} 2743}
2438 2744
2439sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2440 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2441 2747
2442 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2443 2749
2444 if ($exit->slaying eq "/!") {
2445 #TODO: this should de-fi-ni-te-ly not be a sync-job
2446 # the problem is that $exit might not survive long enough
2447 # so it needs to be done right now, right here
2448 cf::sync_job { prepare_random_map $exit };
2449 }
2450
2451 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2452 my $hp = $exit->stats->hp;
2453 my $sp = $exit->stats->sp;
2454
2455 $self->enter_link; 2750 $self->enter_link;
2456 2751
2457 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED);
2460
2461 (async { 2752 (async {
2462 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
2463 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2464 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2465 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2466 1; 2776 1
2467 }) { 2777 }) {
2468 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the crossfire server. "
2469 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2470 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2471 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2811the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2812the message unless the client supports the msg packet.
2503 2813
2504=cut 2814=cut
2505 2815
2816# non-persistent channels (usually the info channel)
2817our %CHANNEL = (
2818 "c/identify" => {
2819 id => "infobox",
2820 title => "Identify",
2821 reply => undef,
2822 tooltip => "Items recently identified",
2823 },
2824 "c/examine" => {
2825 id => "infobox",
2826 title => "Examine",
2827 reply => undef,
2828 tooltip => "Signs and other items you examined",
2829 },
2830 "c/book" => {
2831 id => "infobox",
2832 title => "Book",
2833 reply => undef,
2834 tooltip => "The contents of a note or book",
2835 },
2836 "c/lookat" => {
2837 id => "infobox",
2838 title => "Look",
2839 reply => undef,
2840 tooltip => "What you saw there",
2841 },
2842 "c/who" => {
2843 id => "infobox",
2844 title => "Players",
2845 reply => undef,
2846 tooltip => "Shows players who are currently online",
2847 },
2848 "c/body" => {
2849 id => "infobox",
2850 title => "Body Parts",
2851 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available",
2853 },
2854 "c/uptime" => {
2855 id => "infobox",
2856 title => "Uptime",
2857 reply => undef,
2858 tooltip => "How long the server has been running since last restart",
2859 },
2860 "c/mapinfo" => {
2861 id => "infobox",
2862 title => "Map Info",
2863 reply => undef,
2864 tooltip => "Information related to the maps",
2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2872);
2873
2506sub cf::client::send_msg { 2874sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2875 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2876
2509 $msg = $self->pl->expand_cfpod ($msg); 2877 $msg = $self->pl->expand_cfpod ($msg);
2510 2878
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2879 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2880
2881 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel};
2884
2885 $self->ext_msg (channel_info => $channel)
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id};
2889
2513 if (ref $channel) { 2890 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2891 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2892 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2893 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2894 $self->ext_msg (channel_info => $channel)
2895 if $self->can_msg;
2518 } 2896 }
2519 2897
2520 $channel = $channel->{id}; 2898 $channel = $channel->{id};
2521 } 2899 }
2522 2900
2523 return unless @extra || length $msg; 2901 return unless @extra || length $msg;
2524 2902
2525 if ($self->can_msg) { 2903 if ($self->can_msg) {
2904 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF;
2907
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2908 $self->send_packet ("msg " . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2910 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921
2922 $color &= cf::NDI_COLOR_MASK;
2923
2924 utf8::encode $msg;
2925
2539 if (0 && $msg =~ /\[/) { 2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2929 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2931 $self->send_packet ("drawinfo $color $msg")
2544 } 2932 }
2545 } 2933 }
2546 } 2934 }
2547} 2935}
2548 2936
2549=item $client->ext_event ($type, %msg) 2937=item $client->ext_msg ($type, @msg)
2550 2938
2551Sends an ext event to the client. 2939Sends an ext event to the client.
2552 2940
2553=cut 2941=cut
2554 2942
2555sub cf::client::ext_event($$%) { 2943sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2944 my ($self, $type, @msg) = @_;
2557 2945
2558 return unless $self->extcmd; 2946 if ($self->extcmd == 2) {
2559 2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2949 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 }
2952}
2953
2954=item $client->ext_reply ($msgid, @msg)
2955
2956Sends an ext reply to the client.
2957
2958=cut
2959
2960sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_;
2962
2963 if ($self->extcmd == 2) {
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 }
2562} 2970}
2563 2971
2564=item $success = $client->query ($flags, "text", \&cb) 2972=item $success = $client->query ($flags, "text", \&cb)
2565 2973
2566Queues a query to the client, calling the given callback with 2974Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 3029 my ($ns, $buf) = @_;
2622 3030
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3031 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 3032
2625 if (ref $msg) { 3033 if (ref $msg) {
3034 my ($type, $reply, @payload) =
3035 "ARRAY" eq ref $msg
3036 ? @$msg
3037 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3038
3039 my @reply;
3040
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3041 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 3042 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 3043 }
3044
3045 $ns->ext_reply ($reply, @reply)
3046 if $reply;
3047
2632 } else { 3048 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3049 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 3050 }
2635 3051
2636 cf::override; 3052 cf::override;
2683our $safe = new Safe "safe"; 3099our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3100our $safe_hole = new Safe::Hole;
2685 3101
2686$SIG{FPE} = 'IGNORE'; 3102$SIG{FPE} = 'IGNORE';
2687 3103
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3104$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math
3106 grepstart grepwhile mapstart mapwhile
3107 sort time
3108));
2689 3109
2690# here we export the classes and methods available to script code 3110# here we export the classes and methods available to script code
2691 3111
2692=pod 3112=pod
2693 3113
2694The following functions and methods are available within a safe environment: 3114The following functions and methods are available within a safe environment:
2695 3115
2696 cf::object 3116 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 3117 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 3118 insert remove name archname title slaying race decrease split
2699 3119
2700 cf::object::player 3120 cf::object::player
2701 player 3121 player
2702 3122
2703 cf::player 3123 cf::player
2708 3128
2709=cut 3129=cut
2710 3130
2711for ( 3131for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)], 3133 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)],
2714 ["cf::object::player" => qw(player)], 3135 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3136 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 3137 ["cf::map" => qw(trigger)],
2717) { 3138) {
2718 no strict 'refs'; 3139 no strict 'refs';
2794# the server's init and main functions 3215# the server's init and main functions
2795 3216
2796sub load_facedata($) { 3217sub load_facedata($) {
2797 my ($path) = @_; 3218 my ($path) = @_;
2798 3219
3220 # HACK to clear player env face cache, we need some signal framework
3221 # for this (global event?)
3222 %ext::player_env::MUSIC_FACE_CACHE = ();
3223
3224 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3225
2799 warn "loading facedata from $path\n"; 3226 warn "loading facedata from $path\n";
2800 3227
2801 my $facedata; 3228 my $facedata;
2802 0 < aio_load $path, $facedata 3229 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3230 or die "$path: $!";
2805 $facedata = Coro::Storable::thaw $facedata; 3232 $facedata = Coro::Storable::thaw $facedata;
2806 3233
2807 $facedata->{version} == 2 3234 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3235 or cf::cleanup "$path: version mismatch, cannot proceed.";
2809 3236
3237 # patch in the exptable
3238 $facedata->{resource}{"res/exp_table"} = {
3239 type => FT_RSRC,
3240 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3241 };
3242 cf::cede_to_tick;
3243
2810 { 3244 {
2811 my $faces = $facedata->{faceinfo}; 3245 my $faces = $facedata->{faceinfo};
2812 3246
2813 while (my ($face, $info) = each %$faces) { 3247 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3248 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249
2815 cf::face::set_visibility $idx, $info->{visibility}; 3250 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3251 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3253 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3254
2820 cf::cede_to_tick; 3255 cf::cede_to_tick;
2821 } 3256 }
2822 3257
2823 while (my ($face, $info) = each %$faces) { 3258 while (my ($face, $info) = each %$faces) {
2824 next unless $info->{smooth}; 3259 next unless $info->{smooth};
3260
2825 my $idx = cf::face::find $face 3261 my $idx = cf::face::find $face
2826 or next; 3262 or next;
3263
2827 if (my $smooth = cf::face::find $info->{smooth}) { 3264 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth; 3265 cf::face::set_smooth $idx, $smooth;
2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3266 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2830 } else { 3267 } else {
2831 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3268 warn "smooth face '$info->{smooth}' not found for face '$face'";
2848 3285
2849 { 3286 {
2850 # TODO: for gcfclient pleasure, we should give resources 3287 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3288 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3289 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854 3290
2855 while (my ($name, $info) = each %$res) { 3291 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({ 3292 if (defined $info->{type}) {
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3293 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
2863 3295
2864 if ($name =~ /\.jpg$/) { 3296 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3297 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type};
2867 } else { 3311 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3312 $RESOURCE{$name} = $info;
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3313 }
2874 3314
2875 cf::cede_to_tick; 3315 cf::cede_to_tick;
2876 } 3316 }
2877 } 3317 }
2878 3318
3319 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3320
2879 1 3321 1
2880} 3322}
2881 3323
3324cf::global->attach (on_resource_update => sub {
3325 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3326 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3327
3328 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3329 my $sound = $soundconf->{compat}[$_]
3330 or next;
3331
3332 my $face = cf::face::find "sound/$sound->[1]";
3333 cf::sound::set $sound->[0] => $face;
3334 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3335 }
3336
3337 while (my ($k, $v) = each %{$soundconf->{event}}) {
3338 my $face = cf::face::find "sound/$v";
3339 cf::sound::set $k => $face;
3340 }
3341 }
3342});
3343
3344register_exticmd fx_want => sub {
3345 my ($ns, $want) = @_;
3346
3347 while (my ($k, $v) = each %$want) {
3348 $ns->fx_want ($k, $v);
3349 }
3350};
3351
3352sub load_resource_file($) {
3353 my $guard = lock_acquire "load_resource_file";
3354
3355 my $status = load_resource_file_ $_[0];
3356 get_slot 0.1, 100;
3357 cf::arch::commit_load;
3358
3359 $status
3360}
3361
2882sub reload_regions { 3362sub reload_regions {
3363 # HACK to clear player env face cache, we need some signal framework
3364 # for this (global event?)
3365 %ext::player_env::MUSIC_FACE_CACHE = ();
3366
2883 load_resource_file "$MAPDIR/regions" 3367 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3368 or die "unable to load regions file\n";
2885 3369
2886 for (cf::region::list) { 3370 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3371 $_->{match} = qr/$_->{match}/
2895} 3379}
2896 3380
2897sub reload_archetypes { 3381sub reload_archetypes {
2898 load_resource_file "$DATADIR/archetypes" 3382 load_resource_file "$DATADIR/archetypes"
2899 or die "unable to load archetypes\n"; 3383 or die "unable to load archetypes\n";
2900 #d# NEED to laod twice to resolve forward references
2901 # this really needs to be done in an extra post-pass
2902 # (which needs to be synchronous, so solve it differently)
2903 load_resource_file "$DATADIR/archetypes"
2904 or die "unable to load archetypes\n";
2905} 3384}
2906 3385
2907sub reload_treasures { 3386sub reload_treasures {
2908 load_resource_file "$DATADIR/treasures" 3387 load_resource_file "$DATADIR/treasures"
2909 or die "unable to load treasurelists\n"; 3388 or die "unable to load treasurelists\n";
2910} 3389}
2911 3390
2912sub reload_resources { 3391sub reload_resources {
2913 warn "reloading resource files...\n"; 3392 warn "reloading resource files...\n";
2914 3393
3394 reload_facedata;
3395 reload_archetypes;
2915 reload_regions; 3396 reload_regions;
2916 reload_facedata;
2917 #reload_archetypes;#d#
2918 reload_archetypes;
2919 reload_treasures; 3397 reload_treasures;
2920 3398
2921 warn "finished reloading resource files\n"; 3399 warn "finished reloading resource files\n";
2922} 3400}
2923 3401
2924sub init { 3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
2925 reload_resources; 3407 reload_resources;
2926} 3408}
2927 3409
2928sub cfg_load { 3410sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3411 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3412 or return;
2931 3413
2932 local $/; 3414 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3415 *CFG = YAML::Load <$fh>;
2934 3416
2935 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2936 3418
2937 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3419 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2938 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2949sub main { 3431sub main {
2950 # we must not ever block the main coroutine 3432 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3433 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3435 (async {
2954 Event::one_event; 3436 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3438 })->prio (Coro::PRIO_MAX);
2956 }; 3439 };
2957 3440
2958 cfg_load; 3441 {
3442 my $guard = freeze_mainloop;
3443 reload_config;
2959 db_init; 3444 db_init;
2960 load_extensions; 3445 load_extensions;
2961 3446
2962 $TICK_WATCHER->start; 3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3448 }
3449
2963 Event::loop; 3450 EV::loop;
2964} 3451}
2965 3452
2966############################################################################# 3453#############################################################################
2967# initialisation and cleanup 3454# initialisation and cleanup
2968 3455
2969# install some emergency cleanup handlers 3456# install some emergency cleanup handlers
2970BEGIN { 3457BEGIN {
3458 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3459 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3460 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3461 cf::cleanup "SIG$signal";
2979 },
2980 ); 3462 };
2981 } 3463 }
2982} 3464}
2983 3465
2984sub write_runtime { 3466sub write_runtime_sync {
2985 my $runtime = "$LOCALDIR/runtime"; 3467 my $runtime = "$LOCALDIR/runtime";
2986 3468
2987 # first touch the runtime file to show we are still running: 3469 # first touch the runtime file to show we are still running:
2988 # the fsync below can take a very very long time. 3470 # the fsync below can take a very very long time.
2989 3471
3015 and return; 3497 and return;
3016 3498
3017 warn "runtime file written.\n"; 3499 warn "runtime file written.\n";
3018 3500
3019 1 3501 1
3502}
3503
3504our $uuid_lock;
3505our $uuid_skip;
3506
3507sub write_uuid_sync($) {
3508 $uuid_skip ||= $_[0];
3509
3510 return if $uuid_lock;
3511 local $uuid_lock = 1;
3512
3513 my $uuid = "$LOCALDIR/uuid";
3514
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return;
3517
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3519 $uuid_skip = 0;
3520
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return;
3523
3524 # always fsync - this file is important
3525 aio_fsync $fh
3526 and return;
3527
3528 close $fh
3529 or return;
3530
3531 aio_rename "$uuid~", $uuid
3532 and return;
3533
3534 warn "uuid file written ($value).\n";
3535
3536 1
3537
3538}
3539
3540sub write_uuid($$) {
3541 my ($skip, $sync) = @_;
3542
3543 $sync ? write_uuid_sync $skip
3544 : async { write_uuid_sync $skip };
3020} 3545}
3021 3546
3022sub emergency_save() { 3547sub emergency_save() {
3023 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
3024 3549
3030 # and maps saved/destroyed asynchronously. 3555 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3556 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3557 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3558 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3559 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3561 $pl->save;
3036 } 3562 }
3037 warn "end emergency player save\n"; 3563 warn "end emergency player save\n";
3038 3564
3039 warn "begin emergency map save\n"; 3565 warn "begin emergency map save\n";
3045 warn "end emergency map save\n"; 3571 warn "end emergency map save\n";
3046 3572
3047 warn "begin emergency database checkpoint\n"; 3573 warn "begin emergency database checkpoint\n";
3048 BDB::db_env_txn_checkpoint $DB_ENV; 3574 BDB::db_env_txn_checkpoint $DB_ENV;
3049 warn "end emergency database checkpoint\n"; 3575 warn "end emergency database checkpoint\n";
3576
3577 warn "begin write uuid\n";
3578 write_uuid_sync 1;
3579 warn "end write uuid\n";
3050 }; 3580 };
3051 3581
3052 warn "leave emergency perl save\n"; 3582 warn "leave emergency perl save\n";
3053} 3583}
3054 3584
3069 warn "reloading..."; 3599 warn "reloading...";
3070 3600
3071 warn "entering sync_job"; 3601 warn "entering sync_job";
3072 3602
3073 cf::sync_job { 3603 cf::sync_job {
3074 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3075 cf::emergency_save; 3605 cf::emergency_save;
3076 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3077 3607
3078 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3080 3610
3081 # if anything goes wrong in here, we should simply crash as we already saved 3611 # if anything goes wrong in here, we should simply crash as we already saved
3082
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087 3612
3088 warn "flushing outstanding aio requests"; 3613 warn "flushing outstanding aio requests";
3089 for (;;) { 3614 for (;;) {
3090 BDB::flush; 3615 BDB::flush;
3091 IO::AIO::flush; 3616 IO::AIO::flush;
3092 Coro::cede; 3617 Coro::cede_notself;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3618 last unless IO::AIO::nreqs || BDB::nreqs;
3094 warn "iterate..."; 3619 warn "iterate...";
3095 } 3620 }
3096 3621
3097 ++$RELOAD; 3622 ++$RELOAD;
3156 warn "reloading cf.pm"; 3681 warn "reloading cf.pm";
3157 require cf; 3682 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3684
3160 warn "loading config and database again"; 3685 warn "loading config and database again";
3161 cf::cfg_load; 3686 cf::reload_config;
3162 3687
3163 warn "loading extensions"; 3688 warn "loading extensions";
3164 cf::load_extensions; 3689 cf::load_extensions;
3165 3690
3166 warn "reattaching attachments to objects/players"; 3691 warn "reattaching attachments to objects/players";
3173 warn "leaving sync_job"; 3698 warn "leaving sync_job";
3174 3699
3175 1 3700 1
3176 } or do { 3701 } or do {
3177 warn $@; 3702 warn $@;
3178 warn "error while reloading, exiting."; 3703 cf::cleanup "error while reloading, exiting.";
3179 exit 1;
3180 }; 3704 };
3181 3705
3182 warn "reloaded"; 3706 warn "reloaded";
3183}; 3707};
3184 3708
3186 3710
3187sub reload_perl() { 3711sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 3712 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 3713 # coro crashes during coro_state_free->destroy here.
3190 3714
3191 $RELOAD_WATCHER ||= Event->timer ( 3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3192 reentrant => 0,
3193 after => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => sub {
3196 do_reload_perl; 3716 do_reload_perl;
3197 undef $RELOAD_WATCHER; 3717 undef $RELOAD_WATCHER;
3198 },
3199 ); 3718 };
3200} 3719}
3201 3720
3202register_command "reload" => sub { 3721register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3722 my ($who, $arg) = @_;
3204 3723
3205 if ($who->flag (FLAG_WIZ)) { 3724 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3725 $who->message ("reloading server.");
3726 async {
3727 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3728 reload_perl;
3729 };
3208 } 3730 }
3209}; 3731};
3210 3732
3211unshift @INC, $LIBDIR; 3733unshift @INC, $LIBDIR;
3212 3734
3214 3736
3215our @WAIT_FOR_TICK; 3737our @WAIT_FOR_TICK;
3216our @WAIT_FOR_TICK_BEGIN; 3738our @WAIT_FOR_TICK_BEGIN;
3217 3739
3218sub wait_for_tick { 3740sub wait_for_tick {
3219 return unless $TICK_WATCHER->is_active;
3220 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
3221 3742
3222 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
3223 push @WAIT_FOR_TICK, $signal; 3744 push @WAIT_FOR_TICK, $signal;
3224 $signal->wait; 3745 $signal->wait;
3225} 3746}
3226 3747
3227sub wait_for_tick_begin { 3748sub wait_for_tick_begin {
3228 return unless $TICK_WATCHER->is_active;
3229 return if $Coro::current == $Coro::main; 3749 return if tick_inhibit || $Coro::current == $Coro::main;
3230 3750
3231 my $signal = new Coro::Signal; 3751 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3752 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3753 $signal->wait;
3234} 3754}
3235 3755
3236 my $min = 1e6;#d# 3756sub tick {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 3757 if ($Coro::current != $Coro::main) {
3246 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3758 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3247 unless ++$bug_warning > 10; 3759 unless ++$bug_warning > 10;
3248 return; 3760 return;
3249 } 3761 }
3250 3762
3251 $NOW = $tick_start = Event::time;
3252
3253 cf::server_tick; # one server iteration 3763 cf::server_tick; # one server iteration
3254 3764
3255 0 && sync_job {#d# 3765 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3256 for(1..10) { 3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3257 my $t = Event::time; 3767 Coro::async_pool {
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3768 $Coro::current->{desc} = "runtime saver";
3259 or die; 3769 write_runtime_sync
3260 3770 or warn "ERROR: unable to write runtime file: $!";
3261 $map->width (50);
3262 $map->height (50);
3263 $map->alloc;
3264 $map->_load_objects ("/tmp/x.map", 1);
3265 my $t = Event::time - $t;
3266
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 3771 };
3772 }
3277 3773
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3775 $sig->send;
3294 } 3776 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3777 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3778 $sig->send;
3297 } 3779 }
3298 3780
3299 $NOW = Event::time; 3781 $LOAD = ($NOW - $TICK_START) / $TICK;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3782 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3783
3310 _post_tick; 3784 if (0) {
3311 3785 if ($NEXT_TICK) {
3312 3786 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d#
3789 }
3313 }, 3790 }
3314); 3791}
3315 3792
3316{ 3793{
3317 BDB::max_poll_time $TICK * 0.1; 3794 # configure BDB
3318 $BDB_POLL_WATCHER = Event->io ( 3795
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8; 3796 BDB::min_parallel 8;
3327 3797 BDB::max_poll_reqs $TICK * 0.1;
3328 BDB::set_sync_prepare { 3798 $AnyEvent::BDB::WATCHER->priority (1);
3329 my $status;
3330 my $current = $Coro::current;
3331 (
3332 sub {
3333 $status = $!;
3334 $current->ready; undef $current;
3335 },
3336 sub {
3337 Coro::schedule while defined $current;
3338 $! = $status;
3339 },
3340 )
3341 };
3342 3799
3343 unless ($DB_ENV) { 3800 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3801 $DB_ENV = BDB::db_env_create;
3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3803 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3804 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3805 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3806 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3807
3346 cf::sync_job { 3808 cf::sync_job {
3347 eval { 3809 eval {
3348 BDB::db_env_open 3810 BDB::db_env_open
3349 $DB_ENV, 3811 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3813 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3814 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3815 0666;
3354 3816
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3817 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3818 };
3360 3819
3361 cf::cleanup "db_env_open(db): $@" if $@; 3820 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3821 };
3363 } 3822 }
3823
3824 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3825 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3826 };
3827 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3828 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3829 };
3830 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3831 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3832 };
3364} 3833}
3365 3834
3366{ 3835{
3836 # configure IO::AIO
3837
3367 IO::AIO::min_parallel 8; 3838 IO::AIO::min_parallel 8;
3368
3369 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 3839 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io ( 3840 undef $AnyEvent::AIO::WATCHER;
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 3841}
3380 3842
3381my $_log_backtrace; 3843my $_log_backtrace;
3382 3844
3383sub _log_backtrace { 3845sub _log_backtrace {
3387 3849
3388 # limit the # of concurrent backtraces 3850 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3851 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3852 ++$_log_backtrace;
3391 async { 3853 async {
3854 $Coro::current->{desc} = "abt $msg";
3855
3392 my @bt = fork_call { 3856 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3857 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3858 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3859 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 3860 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines