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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines