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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.427 by root, Sat Apr 26 12:25:45 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;
322 };
323 $TICK_WATCHER->stop;
324 $guard
325} 368}
326 369
370=item cf::periodic $interval, $cb
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
383}
384
327=item cf::get_slot $time[, $priority] 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>:
330This call blocks and returns only when you have at least C<$time> seconds 388This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 389of cpu time till the next tick. The slot is only valid till the next cede.
332 390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
333Useful for short background jobs. 394Useful for short background jobs.
334 395
335=cut 396=cut
336 397
337our @SLOT_QUEUE; 398our @SLOT_QUEUE;
338our $SLOT_QUEUE; 399our $SLOT_QUEUE;
339 400
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
342 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
343 406
344 while () { 407 while () {
345 next_job: 408 next_job:
346 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
354 } 417 }
355 } 418 }
356 } 419 }
357 420
358 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
359 # 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
360 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 424 $signal->wait;
362 } else { 425 } else {
363 Coro::schedule; 426 Coro::schedule;
364 } 427 }
365 } 428 }
366}; 429};
367 430
368sub get_slot($;$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
369 my ($time, $pri) = @_; 434 my ($time, $pri, $name) = @_;
370 435
436 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal;
438
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 439 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 441 $SLOT_QUEUE->ready;
374 $sig->wait; 442 $sig->wait;
375} 443}
376 444
384 452
385BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
386 454
387=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
388 456
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
391partly 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
392acceptable. 460acceptable.
393 461
394If 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
395the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
400 468
401sub sync_job(&) { 469sub sync_job(&) {
402 my ($job) = @_; 470 my ($job) = @_;
403 471
404 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
405 my $time = Event::time; 473 my $time = EV::time;
406 474
407 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
409 477
410 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
411 # (but this is cancel-safe) 479
412 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
413 481
414 my $busy = 1; 482 my $busy = 1;
415 my @res; 483 my @res;
416 484
417 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 487 @res = eval { $job->() };
419 warn $@ if $@; 488 warn $@ if $@;
420 undef $busy; 489 undef $busy;
421 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
422 491
423 while ($busy) { 492 while ($busy) {
424 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
425 } 497 }
498 }
426 499
427 $time = Event::time - $time; 500 my $time = EV::time - $time;
428 501
429 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431
432 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
433 503
434 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
435 } else { 505 } else {
436 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
437 507
462=item fork_call { }, $args 532=item fork_call { }, $args
463 533
464Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
468 538
469=cut 539=cut
470
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479 540
480sub fork_call(&@) { 541sub fork_call(&@) {
481 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
482 543
483# 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,
484# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 547
488 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 549 reset_signals;
502 local $SIG{__WARN__}; 550 &$cb
503 local $SIG{__DIE__}; 551 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 552
510 eval { 553 wantarray ? @res : $res[-1]
511 close $fh1; 554}
512 555
513 my @res = eval { $cb->(@args) }; 556=item $coin = coin_from_name $name
514 557
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 558=cut
516 close $fh2;
517 };
518 559
519 warn $@ if $@; 560our %coin_alias = (
520 _exit 0; 561 "silver" => "silvercoin",
521 } 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
522} 581}
523 582
524=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
525 584
526Returns a single value from the environment database. 585Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
529 588
530Stores 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
531data 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).
532 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
533=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}
534 615
535our $DB; 616our $DB;
536 617
537sub db_init { 618sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 619 cf::sync_job {
542 eval { 620 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 621 };
552} 622}
553 623
554sub db_get($$) { 624sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
556 626
606 if (1) { 676 if (1) {
607 $md5 = 677 $md5 =
608 join "\x00", 678 join "\x00",
609 $processversion, 679 $processversion,
610 map { 680 map {
611 Coro::cede; 681 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 683 } 0.. $#$src;
614 684
615 685
616 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
660attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
662 732
663In 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>
664C<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
665Crossfire TRT). 735Deliantra).
666 736
667=over 4 737=over 4
668 738
669=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
670 740
952 } 1022 }
953 1023
954 0 1024 0
955} 1025}
956 1026
957=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
958 1028
959=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
960 1030
961Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
962 1032
968 1038
969=cut 1039=cut
970 1040
971############################################################################# 1041#############################################################################
972# object support 1042# object support
973#
974 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#
975sub _can_merge { 1077sub _can_merge {
976 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
977 1079
978 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1081
982 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
983} 1084}
984 1085
985sub reattach { 1086sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1088 my ($obj) = @_;
1009cf::attachable->attach ( 1110cf::attachable->attach (
1010 prio => -1000000, 1111 prio => -1000000,
1011 on_instantiate => sub { 1112 on_instantiate => sub {
1012 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1013 1114
1014 $data = from_json $data; 1115 $data = decode_json $data;
1015 1116
1016 for (@$data) { 1117 for (@$data) {
1017 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1018 1119
1019 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1035sub object_freezer_save { 1136sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
1037 1138
1038 sync_job { 1139 sync_job {
1039 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1042 1144
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1149 aio_close $fh;
1048 1150
1049 if (@$objs) { 1151 if (@$objs) {
1050 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) {
1051 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1157 aio_close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1159 }
1058 } else { 1160 } else {
1059 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1060 } 1162 }
1065 } 1167 }
1066 } else { 1168 } else {
1067 aio_unlink $filename; 1169 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1069 } 1171 }
1070 } 1172 };
1071} 1173}
1072 1174
1073sub object_freezer_as_string { 1175sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1075 1177
1087 or return; 1189 or return;
1088 1190
1089 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1193 or return;
1194
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1093 } 1197 }
1094 1198
1199 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1097 return ($data, $av); 1203 ($data, $av)
1098} 1204}
1099 1205
1100=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1101 1207
1102=over 4 1208=over 4
1175 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1176 1282
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1284
1179 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
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1185 } else { 1300 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1302 }
1188 1303
1189 cf::override; 1304 cf::override;
1242 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1243 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1244 1359
1245 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1246 warn $msg; 1361 warn $msg;
1247 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1248 exit 1;
1249 } 1363 }
1250 1364
1251 warn $msg; 1365 warn $msg;
1252 } 1366 }
1253 1367
1278use Coro::AIO; 1392use Coro::AIO;
1279 1393
1280=head3 cf::player 1394=head3 cf::player
1281 1395
1282=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}
1283 1411
1284=item cf::player::find $login 1412=item cf::player::find $login
1285 1413
1286Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1287 1415
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1455
1328 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1329 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;
1330 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1331 } 1465 }
1332 } 1466 }
1333} 1467}
1334 1468
1343 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1344 1478
1345 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1347 1481
1482 cf::get_slot 0.01;
1483
1348 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1349 Coro::cede; 1485 cf::cede_to_tick;
1350} 1486}
1351 1487
1352sub new($) { 1488sub new($) {
1353 my ($login) = @_; 1489 my ($login) = @_;
1354 1490
1358 $self->{deny_save} = 1; 1494 $self->{deny_save} = 1;
1359 1495
1360 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1361 1497
1362 $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 (@_);
1363} 1509}
1364 1510
1365=item $pl->quit_character 1511=item $pl->quit_character
1366 1512
1367Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1568 or return [];
1423 1569
1424 my @logins; 1570 my @logins;
1425 1571
1426 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") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1581 }
1430 1582
1431 utf8::decode $login; 1583 utf8::decode $login;
1432 push @logins, $login; 1584 push @logins, $login;
1433 } 1585 }
1434 1586
1467 1619
1468Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1469 1621
1470=cut 1622=cut
1471 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
1472sub expand_cfpod { 1635sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1474 1637
1475 # escape & and < 1638 my $xml;
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478 1639
1479 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1480 1643
1481 1 while 1644 $group =~ s/&/&amp;/g;
1482 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1486 # replace G<male|female> tags 1649 ([BCGHITU])
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1650 <
1488 $self->gender ? $2 : $1 1651 (?:
1489 }ge 1652 ([^<>]*) (?{ $group = $^N })
1490 # replace H<hint text> 1653 | < $interior >
1491 || s{H<([^\>]*)>} 1654 )
1655 >
1656 %gcsx
1492 { 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") {
1493 ("<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>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "") 1677 "")
1496 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1497 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1498 1689
1690 for ($xml) {
1499 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1501 1693
1502 # compress some whitespace 1694 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1507 1700
1508 $_ 1701 $xml
1509} 1702}
1703
1704no re 'eval';
1510 1705
1511sub hintmode { 1706sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1708 $_[0]{hintmode}
1514} 1709}
1515 1710
1516=item $player->ext_reply ($msgid, %msg) 1711=item $player->ext_reply ($msgid, @msg)
1517 1712
1518Sends an ext reply to the player. 1713Sends an ext reply to the player.
1519 1714
1520=cut 1715=cut
1521 1716
1522sub ext_reply($$%) { 1717sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1718 my ($self, $id, @msg) = @_;
1524 1719
1525 $msg{msgid} = $id; 1720 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1721}
1528 1722
1529=item $player->ext_event ($type, %msg) 1723=item $player->ext_msg ($type, @msg)
1530 1724
1531Sends an ext event to the client. 1725Sends an ext event to the client.
1532 1726
1533=cut 1727=cut
1534 1728
1535sub ext_event($$%) { 1729sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1730 my ($self, $type, @msg) = @_;
1537 1731
1538 $self->ns->ext_event ($type, %msg); 1732 $self->ns->ext_msg ($type, @msg);
1539} 1733}
1540 1734
1541=head3 cf::region 1735=head3 cf::region
1542 1736
1543=over 4 1737=over 4
1587our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1588our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1589 1783
1590sub generate_random_map { 1784sub generate_random_map {
1591 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
1592 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1593 $self->_create_random_map ( 1790 $self->_create_random_map (
1594 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1595 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1596 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 1915
1719# the temporary/swap location 1916# the temporary/swap location
1720sub save_path { 1917sub save_path {
1721 my ($self) = @_; 1918 my ($self) = @_;
1722 1919
1723 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1724 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1725} 1922}
1726 1923
1727# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1728sub uniq_path { 1925sub uniq_path {
1729 my ($self) = @_; 1926 my ($self) = @_;
1730 1927
1731 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1732 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1733} 1930}
1734 1931
1735# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1736# all maps in C++... 1933# all maps in C++...
1759 1956
1760sub load_header_from($) { 1957sub load_header_from($) {
1761 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1762 1959
1763 utf8::encode $path; 1960 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 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;
1769 1969
1770 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1771 1971
1772 1 1972 1
1773} 1973}
1827sub find { 2027sub find {
1828 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1829 2029
1830 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1831 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1833 2034
1834 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
1836 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1837 or return; 2040 or return;
1838 2041
1839 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1840 2043
1842 or return; 2045 or return;
1843 2046
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard1;
2051 undef $guard2;
1847 $map->reset; 2052 $map->reset;
1848 undef $guard;
1849 return find $path; 2053 return find $path;
1850 } 2054 }
1851 2055
1852 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1853 } 2057 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1863 2067
1864 my $path = $self->{path}; 2068 my $path = $self->{path};
1865 2069
1866 { 2070 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1868 2072
2073 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2075
1871 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1872 2077
1873 $self->alloc; 2078 $self->alloc;
1874 2079
1875 $self->pre_load; 2080 $self->pre_load;
1876 Coro::cede; 2081 cf::cede_to_tick;
1877 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1879 or return; 2086 or return;
1880 2087
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1883 2090
1884 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2092 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2095 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1889 } 2099 }
1890 } 2100 }
1891 2101
1892 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1893 # now do the right thing for maps 2105 # now do the right thing for maps
1894 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2108 unless $self->difficulty;
1897 Coro::cede; 2109 cf::cede_to_tick;
1898 2110
1899 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2112 $self->decay_objects;
1901 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1902 $self->update_buttons; 2114 $self->update_buttons;
1903 Coro::cede; 2115 cf::cede_to_tick;
1904 $self->set_darkness_map; 2116 $self->set_darkness_map;
1905 Coro::cede; 2117 cf::cede_to_tick;
1906 $self->activate; 2118 $self->activate;
1907 } 2119 }
1908 2120
2121 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME);
2123
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1910 } 2125 }
1911 2126
1912 $self->post_load; 2127 $self->post_load;
1913} 2128}
1914 2129
1923 2138
1924 $self 2139 $self
1925} 2140}
1926 2141
1927# 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
1928sub load_diag { 2143sub load_neighbours {
1929 my ($map) = @_; 2144 my ($map) = @_;
1930 2145
1931 my @diag; # diagonal neighbours 2146 my @neigh; # diagonal neighbours
1932 2147
1933 for (0 .. 3) { 2148 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2149 my $neigh = $map->tile_path ($_)
1935 or next; 2150 or next;
1936 $neigh = find $neigh, $map 2151 $neigh = find $neigh, $map
1937 or next; 2152 or next;
1938 $neigh->load; 2153 $neigh->load;
1939 2154
2155 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2156 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2157 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2158 }
1943 2159
1944 for (@diag) { 2160 for (grep defined $_->[0], @neigh) {
2161 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2162 my $neigh = find $path, $origin
1946 or next; 2163 or next;
1947 $neigh->load; 2164 $neigh->load;
1948 } 2165 }
1949} 2166}
1950 2167
1955} 2172}
1956 2173
1957sub do_load_sync { 2174sub do_load_sync {
1958 my ($map) = @_; 2175 my ($map) = @_;
1959 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1960 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1961} 2181}
1962 2182
1963our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1965 2185
1966sub find_async { 2186sub find_async {
1967 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1968 2188
1969 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1970 2190
1971 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2193 }
1974 2194
1975 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1976 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1977 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2202 if (my $map = find $k) {
1980 $map->load; 2203 $map->load if $v;
1981 } 2204 }
1982 2205
1983 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1984 } 2207 }
1985 } 2208 }
1986 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1987 }; 2210 };
1988 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
1991} 2214}
1992 2215
1993sub save { 2216sub save {
1994 my ($self) = @_; 2217 my ($self) = @_;
1995 2218
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2220
1998 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1999 2222
2000 return unless $self->dirty; 2223 return unless $self->dirty;
2001 2224
2007 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2008 2231
2009 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
2010 2233
2011 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2013 }; 2237 };
2238
2239 cf::get_slot 0.02;
2014 2240
2015 if ($uniq) { 2241 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2244 } else {
2024 my ($self) = @_; 2250 my ($self) = @_;
2025 2251
2026 # save first because save cedes 2252 # save first because save cedes
2027 $self->save; 2253 $self->save;
2028 2254
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2256
2031 return if $self->players; 2257 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2034 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2265 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2266}
2038 2267
2039sub reset_at { 2268sub reset_at {
2040 my ($self) = @_; 2269 my ($self) = @_;
2041 2270
2073 if $uniq; 2302 if $uniq;
2074 } 2303 }
2075 2304
2076 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
2077 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2309 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2310
2082 $self->unlink_save; 2311 $self->unlink_save;
2083 $self->destroy; 2312 $self->destroy;
2084} 2313}
2085 2314
2086my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
2087 2316
2088sub nuke { 2317sub nuke {
2089 my ($self) = @_; 2318 my ($self) = @_;
2090 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2091 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
2092 2324
2093 $self->unlink_save; 2325 $self->unlink_save;
2094 2326
2095 bless $self, "cf::map"; 2327 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2332
2101 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
2102 2335
2103 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2104} 2337}
2105 2338
2106=item $maps = cf::map::tmp_maps 2339=item $maps = cf::map::tmp_maps
2148 2381
2149sub unique_maps() { 2382sub unique_maps() {
2150 [ 2383 [
2151 map { 2384 map {
2152 utf8::decode $_; 2385 utf8::decode $_;
2153 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2154 ? normalise $_ 2389 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2391 ]
2158} 2392}
2159 2393
2160package cf;
2161
2162=back 2394=back
2163 2395
2164=head3 cf::object 2396=head3 cf::object
2165 2397
2166=cut 2398=cut
2169 2401
2170=over 4 2402=over 4
2171 2403
2172=item $ob->inv_recursive 2404=item $ob->inv_recursive
2173 2405
2174Returns 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.
2175 2408
2176=cut 2409=cut
2177 2410
2178sub inv_recursive_; 2411sub inv_recursive_;
2179sub inv_recursive_ { 2412sub inv_recursive_ {
2180 map { $_, inv_recursive_ $_->inv } @_ 2413 map { $_, inv_recursive_ $_->inv } @_
2181} 2414}
2182 2415
2183sub inv_recursive { 2416sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2418}
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 }
2185} 2446}
2186 2447
2187package cf; 2448package cf;
2188 2449
2189=back 2450=back
2213 2474
2214 } else { 2475 } else {
2215 my $pl = $self->contr; 2476 my $pl = $self->contr;
2216 2477
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2478 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2479 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2481
2226 } else { 2482 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2483 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2484 $self->message ($msg, $flags);
2229 } 2485 }
2230 } 2486 }
2487}
2488
2489=item $object->send_msg ($channel, $msg, $color, [extra...])
2490
2491=cut
2492
2493sub cf::object::send_msg {
2494 my $pl = shift->contr
2495 or return;
2496 $pl->send_msg (@_);
2231} 2497}
2232 2498
2233=item $player_object->may ("access") 2499=item $player_object->may ("access")
2234 2500
2235Returns wether the given player is authorized to access resource "access" 2501Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2582 if $x <=0 && $y <= 0;
2317 2583
2318 $map->load; 2584 $map->load;
2319 $map->load_diag; 2585 $map->load_neighbours;
2320 2586
2321 return unless $self->contr->active; 2587 return unless $self->contr->active;
2322 $self->activate_recursive; 2588 $self->activate_recursive;
2323 2589
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2610 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2611
2346 $self->enter_link; 2612 $self->enter_link;
2347 2613
2348 (async { 2614 (async {
2615 $Coro::current->{desc} = "player::goto $path $x $y";
2616
2617 # *tag paths override both path and x|y
2618 if ($path =~ /^\*(.*)$/) {
2619 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2620 my $ob = $obs[rand @obs];
2621
2622 # see if we actually can go there
2623 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2624 $ob = $obs[rand @obs];
2625 } else {
2626 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2627 }
2628 # else put us there anyways for now #d#
2629
2630 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2631 } else {
2632 ($path, $x, $y) = (undef, undef, undef);
2633 }
2634 }
2635
2349 my $map = eval { 2636 my $map = eval {
2350 my $map = cf::map::find $path; 2637 my $map = defined $path ? cf::map::find $path : undef;
2351 2638
2352 if ($map) { 2639 if ($map) {
2353 $map = $map->customise_for ($self); 2640 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2641 $map = $check->($map) if $check && $map;
2355 } else { 2642 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2643 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2644 }
2358 2645
2359 $map 2646 $map
2360 }; 2647 };
2361 2648
2414 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2415 } 2702 }
2416 2703
2417 $rmp->{random_seed} ||= $exit->random_seed; 2704 $rmp->{random_seed} ||= $exit->random_seed;
2418 2705
2419 my $data = cf::to_json $rmp; 2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2707 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2708 my $meta = "$RANDOMDIR/$md5.meta";
2422 2709
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2711 aio_write $fh, 0, (length $data), $data, 0;
2451 # if exit is damned, update players death & WoR home-position 2738 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2739 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2740 if $exit->flag (FLAG_DAMNED);
2454 2741
2455 (async { 2742 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2744
2456 $self->deactivate_recursive; # just to be sure 2745 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2746 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2747 $self->goto ($slaying, $hp, $sp);
2459 2748
2460 1; 2749 1;
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2784the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2785the message unless the client supports the msg packet.
2497 2786
2498=cut 2787=cut
2499 2788
2789# non-persistent channels (usually the info channel)
2790our %CHANNEL = (
2791 "c/identify" => {
2792 id => "infobox",
2793 title => "Identify",
2794 reply => undef,
2795 tooltip => "Items recently identified",
2796 },
2797 "c/examine" => {
2798 id => "infobox",
2799 title => "Examine",
2800 reply => undef,
2801 tooltip => "Signs and other items you examined",
2802 },
2803 "c/book" => {
2804 id => "infobox",
2805 title => "Book",
2806 reply => undef,
2807 tooltip => "The contents of a note or book",
2808 },
2809 "c/lookat" => {
2810 id => "infobox",
2811 title => "Look",
2812 reply => undef,
2813 tooltip => "What you saw there",
2814 },
2815 "c/who" => {
2816 id => "infobox",
2817 title => "Players",
2818 reply => undef,
2819 tooltip => "Shows players who are currently online",
2820 },
2821 "c/body" => {
2822 id => "infobox",
2823 title => "Body Parts",
2824 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available",
2826 },
2827 "c/uptime" => {
2828 id => "infobox",
2829 title => "Uptime",
2830 reply => undef,
2831 tooltip => "How long the server has been running since last restart",
2832 },
2833 "c/mapinfo" => {
2834 id => "infobox",
2835 title => "Map Info",
2836 reply => undef,
2837 tooltip => "Information related to the maps",
2838 },
2839 "c/party" => {
2840 id => "party",
2841 title => "Party",
2842 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party",
2844 },
2845);
2846
2500sub cf::client::send_msg { 2847sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2848 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2849
2503 $msg = $self->pl->expand_cfpod ($msg); 2850 $msg = $self->pl->expand_cfpod ($msg);
2504 2851
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2852 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2853
2854 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) {
2856 $channel = $CHANNEL{$channel};
2857
2858 $self->ext_msg (channel_info => $channel)
2859 if $self->can_msg;
2860
2861 $channel = $channel->{id};
2862
2507 if (ref $channel) { 2863 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2867 $self->ext_msg (channel_info => $channel)
2868 if $self->can_msg;
2512 } 2869 }
2513 2870
2514 $channel = $channel->{id}; 2871 $channel = $channel->{id};
2515 } 2872 }
2516 2873
2517 return unless @extra || length $msg; 2874 return unless @extra || length $msg;
2518 2875
2519 if ($self->can_msg) { 2876 if ($self->can_msg) {
2877 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF;
2880
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2881 $self->send_packet ("msg " . $self->{json_coder}->encode (
2882 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2883 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2884 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones
2886 for ($msg) {
2887 1 while
2888 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2889 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2890 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2891 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2892 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2893 }
2894
2895 $color &= cf::NDI_COLOR_MASK;
2896
2897 utf8::encode $msg;
2898
2533 if (0 && $msg =~ /\[/) { 2899 if (0 && $msg =~ /\[/) {
2900 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2901 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2902 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2903 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2904 $self->send_packet ("drawinfo $color $msg")
2538 } 2905 }
2539 } 2906 }
2540 } 2907 }
2541} 2908}
2542 2909
2543=item $client->ext_event ($type, %msg) 2910=item $client->ext_msg ($type, @msg)
2544 2911
2545Sends an ext event to the client. 2912Sends an ext event to the client.
2546 2913
2547=cut 2914=cut
2548 2915
2549sub cf::client::ext_event($$%) { 2916sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2917 my ($self, $type, @msg) = @_;
2551 2918
2552 return unless $self->extcmd; 2919 if ($self->extcmd == 2) {
2553 2920 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2921 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2922 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2923 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2924 }
2925}
2926
2927=item $client->ext_reply ($msgid, @msg)
2928
2929Sends an ext reply to the client.
2930
2931=cut
2932
2933sub cf::client::ext_reply($$@) {
2934 my ($self, $id, @msg) = @_;
2935
2936 if ($self->extcmd == 2) {
2937 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2938 } elsif ($self->extcmd == 1) {
2939 #TODO: version 1, remove
2940 unshift @msg, msgtype => "reply", msgid => $id;
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2942 }
2556} 2943}
2557 2944
2558=item $success = $client->query ($flags, "text", \&cb) 2945=item $success = $client->query ($flags, "text", \&cb)
2559 2946
2560Queues a query to the client, calling the given callback with 2947Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 3002 my ($ns, $buf) = @_;
2616 3003
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3004 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 3005
2619 if (ref $msg) { 3006 if (ref $msg) {
3007 my ($type, $reply, @payload) =
3008 "ARRAY" eq ref $msg
3009 ? @$msg
3010 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3011
3012 my @reply;
3013
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3014 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 3015 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 3016 }
3017
3018 $ns->ext_reply ($reply, @reply)
3019 if $reply;
3020
2626 } else { 3021 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3022 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 3023 }
2629 3024
2630 cf::override; 3025 cf::override;
2677our $safe = new Safe "safe"; 3072our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3073our $safe_hole = new Safe::Hole;
2679 3074
2680$SIG{FPE} = 'IGNORE'; 3075$SIG{FPE} = 'IGNORE';
2681 3076
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3077$safe->permit_only (Opcode::opset qw(
3078 :base_core :base_mem :base_orig :base_math
3079 grepstart grepwhile mapstart mapwhile
3080 sort time
3081));
2683 3082
2684# here we export the classes and methods available to script code 3083# here we export the classes and methods available to script code
2685 3084
2686=pod 3085=pod
2687 3086
2688The following functions and methods are available within a safe environment: 3087The following functions and methods are available within a safe environment:
2689 3088
2690 cf::object 3089 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3090 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3091 insert remove name archname title slaying race decrease split
2693 3092
2694 cf::object::player 3093 cf::object::player
2695 player 3094 player
2696 3095
2697 cf::player 3096 cf::player
2702 3101
2703=cut 3102=cut
2704 3103
2705for ( 3104for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)], 3106 insert remove inv name archname title slaying race
3107 decrease split destroy)],
2708 ["cf::object::player" => qw(player)], 3108 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3109 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 3110 ["cf::map" => qw(trigger)],
2711) { 3111) {
2712 no strict 'refs'; 3112 no strict 'refs';
2788# the server's init and main functions 3188# the server's init and main functions
2789 3189
2790sub load_facedata($) { 3190sub load_facedata($) {
2791 my ($path) = @_; 3191 my ($path) = @_;
2792 3192
3193 # HACK to clear player env face cache, we need some signal framework
3194 # for this (global event?)
3195 %ext::player_env::MUSIC_FACE_CACHE = ();
3196
3197 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3198
2793 warn "loading facedata from $path\n"; 3199 warn "loading facedata from $path\n";
2794 3200
2795 my $facedata; 3201 my $facedata;
2796 0 < aio_load $path, $facedata 3202 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3203 or die "$path: $!";
2799 $facedata = Coro::Storable::thaw $facedata; 3205 $facedata = Coro::Storable::thaw $facedata;
2800 3206
2801 $facedata->{version} == 2 3207 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3208 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 3209
3210 # patch in the exptable
3211 $facedata->{resource}{"res/exp_table"} = {
3212 type => FT_RSRC,
3213 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3214 };
3215 cf::cede_to_tick;
3216
2804 { 3217 {
2805 my $faces = $facedata->{faceinfo}; 3218 my $faces = $facedata->{faceinfo};
2806 3219
2807 while (my ($face, $info) = each %$faces) { 3220 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3221 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222
2809 cf::face::set_visibility $idx, $info->{visibility}; 3223 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3224 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3225 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3227
2814 cf::cede_to_tick; 3228 cf::cede_to_tick;
2815 } 3229 }
2816 3230
2817 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3232 next unless $info->{smooth};
3233
2819 my $idx = cf::face::find $face 3234 my $idx = cf::face::find $face
2820 or next; 3235 or next;
3236
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3237 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3238 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3240 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3241 warn "smooth face '$info->{smooth}' not found for face '$face'";
2842 3258
2843 { 3259 {
2844 # TODO: for gcfclient pleasure, we should give resources 3260 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3261 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3262 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3263
2849 while (my ($name, $info) = each %$res) { 3264 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3265 if (defined $info->{type}) {
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3266 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3267 my $data;
2857 3268
2858 if ($name =~ /\.jpg$/) { 3269 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3270 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3271
3272 my $meta = $enc->encode ({
3273 name => $name,
3274 %{ $info->{meta} || {} },
3275 });
3276
3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type};
2861 } else { 3284 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3285 $RESOURCE{$name} = $info;
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3286 }
2868 3287
2869 cf::cede_to_tick; 3288 cf::cede_to_tick;
2870 } 3289 }
2871 } 3290 }
2872 3291
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3293
2873 1 3294 1
2874} 3295}
2875 3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
3316
3317register_exticmd fx_want => sub {
3318 my ($ns, $want) = @_;
3319
3320 while (my ($k, $v) = each %$want) {
3321 $ns->fx_want ($k, $v);
3322 }
3323};
3324
3325sub load_resource_file($) {
3326 my $guard = lock_acquire "load_resource_file";
3327
3328 my $status = load_resource_file_ $_[0];
3329 get_slot 0.1, 100;
3330 cf::arch::commit_load;
3331
3332 $status
3333}
3334
2876sub reload_regions { 3335sub reload_regions {
3336 # HACK to clear player env face cache, we need some signal framework
3337 # for this (global event?)
3338 %ext::player_env::MUSIC_FACE_CACHE = ();
3339
2877 load_resource_file "$MAPDIR/regions" 3340 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3341 or die "unable to load regions file\n";
2879 3342
2880 for (cf::region::list) { 3343 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3344 $_->{match} = qr/$_->{match}/
2889} 3352}
2890 3353
2891sub reload_archetypes { 3354sub reload_archetypes {
2892 load_resource_file "$DATADIR/archetypes" 3355 load_resource_file "$DATADIR/archetypes"
2893 or die "unable to load archetypes\n"; 3356 or die "unable to load archetypes\n";
2894 #d# NEED to laod twice to resolve forward references
2895 # this really needs to be done in an extra post-pass
2896 # (which needs to be synchronous, so solve it differently)
2897 load_resource_file "$DATADIR/archetypes"
2898 or die "unable to load archetypes\n";
2899} 3357}
2900 3358
2901sub reload_treasures { 3359sub reload_treasures {
2902 load_resource_file "$DATADIR/treasures" 3360 load_resource_file "$DATADIR/treasures"
2903 or die "unable to load treasurelists\n"; 3361 or die "unable to load treasurelists\n";
2904} 3362}
2905 3363
2906sub reload_resources { 3364sub reload_resources {
2907 warn "reloading resource files...\n"; 3365 warn "reloading resource files...\n";
2908 3366
3367 reload_facedata;
3368 reload_archetypes;
2909 reload_regions; 3369 reload_regions;
2910 reload_facedata;
2911 #reload_archetypes;#d#
2912 reload_archetypes;
2913 reload_treasures; 3370 reload_treasures;
2914 3371
2915 warn "finished reloading resource files\n"; 3372 warn "finished reloading resource files\n";
2916} 3373}
2917 3374
2918sub init { 3375sub init {
3376 my $guard = freeze_mainloop;
3377
2919 reload_resources; 3378 reload_resources;
2920} 3379}
2921 3380
2922sub cfg_load { 3381sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3382 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3383 or return;
2925 3384
2926 local $/; 3385 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3386 *CFG = YAML::Load <$fh>;
2928 3387
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2930 3389
2931 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2932 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2943sub main { 3402sub main {
2944 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3406 (async {
2948 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
2950 }; 3410 };
2951 3411
2952 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
2953 db_init; 3415 db_init;
2954 load_extensions; 3416 load_extensions;
2955 3417
2956 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 }
3421
2957 Event::loop; 3422 EV::loop;
2958} 3423}
2959 3424
2960############################################################################# 3425#############################################################################
2961# initialisation and cleanup 3426# initialisation and cleanup
2962 3427
2963# install some emergency cleanup handlers 3428# install some emergency cleanup handlers
2964BEGIN { 3429BEGIN {
3430 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3431 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3432 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2967 reentrant => 0,
2968 data => WF_AUTOCANCEL,
2969 signal => $signal,
2970 prio => 0,
2971 cb => sub {
2972 cf::cleanup "SIG$signal"; 3433 cf::cleanup "SIG$signal";
2973 },
2974 ); 3434 };
2975 } 3435 }
2976} 3436}
2977 3437
2978sub write_runtime { 3438sub write_runtime_sync {
2979 my $runtime = "$LOCALDIR/runtime"; 3439 my $runtime = "$LOCALDIR/runtime";
2980 3440
2981 # first touch the runtime file to show we are still running: 3441 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time. 3442 # the fsync below can take a very very long time.
2983 3443
3009 and return; 3469 and return;
3010 3470
3011 warn "runtime file written.\n"; 3471 warn "runtime file written.\n";
3012 3472
3013 1 3473 1
3474}
3475
3476our $uuid_lock;
3477our $uuid_skip;
3478
3479sub write_uuid_sync($) {
3480 $uuid_skip ||= $_[0];
3481
3482 return if $uuid_lock;
3483 local $uuid_lock = 1;
3484
3485 my $uuid = "$LOCALDIR/uuid";
3486
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return;
3489
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3491 $uuid_skip = 0;
3492
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return;
3495
3496 # always fsync - this file is important
3497 aio_fsync $fh
3498 and return;
3499
3500 close $fh
3501 or return;
3502
3503 aio_rename "$uuid~", $uuid
3504 and return;
3505
3506 warn "uuid file written ($value).\n";
3507
3508 1
3509
3510}
3511
3512sub write_uuid($$) {
3513 my ($skip, $sync) = @_;
3514
3515 $sync ? write_uuid_sync $skip
3516 : async { write_uuid_sync $skip };
3014} 3517}
3015 3518
3016sub emergency_save() { 3519sub emergency_save() {
3017 my $freeze_guard = cf::freeze_mainloop; 3520 my $freeze_guard = cf::freeze_mainloop;
3018 3521
3024 # and maps saved/destroyed asynchronously. 3527 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3528 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3529 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3530 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3531 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3533 $pl->save;
3030 } 3534 }
3031 warn "end emergency player save\n"; 3535 warn "end emergency player save\n";
3032 3536
3033 warn "begin emergency map save\n"; 3537 warn "begin emergency map save\n";
3039 warn "end emergency map save\n"; 3543 warn "end emergency map save\n";
3040 3544
3041 warn "begin emergency database checkpoint\n"; 3545 warn "begin emergency database checkpoint\n";
3042 BDB::db_env_txn_checkpoint $DB_ENV; 3546 BDB::db_env_txn_checkpoint $DB_ENV;
3043 warn "end emergency database checkpoint\n"; 3547 warn "end emergency database checkpoint\n";
3548
3549 warn "begin write uuid\n";
3550 write_uuid_sync 1;
3551 warn "end write uuid\n";
3044 }; 3552 };
3045 3553
3046 warn "leave emergency perl save\n"; 3554 warn "leave emergency perl save\n";
3047} 3555}
3048 3556
3063 warn "reloading..."; 3571 warn "reloading...";
3064 3572
3065 warn "entering sync_job"; 3573 warn "entering sync_job";
3066 3574
3067 cf::sync_job { 3575 cf::sync_job {
3068 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3069 cf::emergency_save; 3577 cf::emergency_save;
3070 cf::write_runtime; # external watchdog should not bark 3578 cf::write_runtime_sync; # external watchdog should not bark
3071 3579
3072 warn "syncing database to disk"; 3580 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3074 3582
3075 # if anything goes wrong in here, we should simply crash as we already saved 3583 # if anything goes wrong in here, we should simply crash as we already saved
3076
3077 warn "cancelling all WF_AUTOCANCEL watchers";
3078 for (Event::all_watchers) {
3079 $_->cancel if $_->data & WF_AUTOCANCEL;
3080 }
3081 3584
3082 warn "flushing outstanding aio requests"; 3585 warn "flushing outstanding aio requests";
3083 for (;;) { 3586 for (;;) {
3084 BDB::flush; 3587 BDB::flush;
3085 IO::AIO::flush; 3588 IO::AIO::flush;
3086 Coro::cede; 3589 Coro::cede_notself;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3590 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate..."; 3591 warn "iterate...";
3089 } 3592 }
3090 3593
3091 ++$RELOAD; 3594 ++$RELOAD;
3150 warn "reloading cf.pm"; 3653 warn "reloading cf.pm";
3151 require cf; 3654 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3656
3154 warn "loading config and database again"; 3657 warn "loading config and database again";
3155 cf::cfg_load; 3658 cf::reload_config;
3156 3659
3157 warn "loading extensions"; 3660 warn "loading extensions";
3158 cf::load_extensions; 3661 cf::load_extensions;
3159 3662
3160 warn "reattaching attachments to objects/players"; 3663 warn "reattaching attachments to objects/players";
3167 warn "leaving sync_job"; 3670 warn "leaving sync_job";
3168 3671
3169 1 3672 1
3170 } or do { 3673 } or do {
3171 warn $@; 3674 warn $@;
3172 warn "error while reloading, exiting."; 3675 cf::cleanup "error while reloading, exiting.";
3173 exit 1;
3174 }; 3676 };
3175 3677
3176 warn "reloaded"; 3678 warn "reloaded";
3177}; 3679};
3178 3680
3180 3682
3181sub reload_perl() { 3683sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 3684 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 3685 # coro crashes during coro_state_free->destroy here.
3184 3686
3185 $RELOAD_WATCHER ||= Event->timer ( 3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3186 reentrant => 0,
3187 after => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => sub {
3190 do_reload_perl; 3688 do_reload_perl;
3191 undef $RELOAD_WATCHER; 3689 undef $RELOAD_WATCHER;
3192 },
3193 ); 3690 };
3194} 3691}
3195 3692
3196register_command "reload" => sub { 3693register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3694 my ($who, $arg) = @_;
3198 3695
3199 if ($who->flag (FLAG_WIZ)) { 3696 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3697 $who->message ("reloading server.");
3698 async {
3699 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3700 reload_perl;
3701 };
3202 } 3702 }
3203}; 3703};
3204 3704
3205unshift @INC, $LIBDIR; 3705unshift @INC, $LIBDIR;
3206 3706
3208 3708
3209our @WAIT_FOR_TICK; 3709our @WAIT_FOR_TICK;
3210our @WAIT_FOR_TICK_BEGIN; 3710our @WAIT_FOR_TICK_BEGIN;
3211 3711
3212sub wait_for_tick { 3712sub wait_for_tick {
3213 return unless $TICK_WATCHER->is_active;
3214 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3215 3714
3216 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3217 push @WAIT_FOR_TICK, $signal; 3716 push @WAIT_FOR_TICK, $signal;
3218 $signal->wait; 3717 $signal->wait;
3219} 3718}
3220 3719
3221sub wait_for_tick_begin { 3720sub wait_for_tick_begin {
3222 return unless $TICK_WATCHER->is_active;
3223 return if $Coro::current == $Coro::main; 3721 return if tick_inhibit || $Coro::current == $Coro::main;
3224 3722
3225 my $signal = new Coro::Signal; 3723 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3724 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3725 $signal->wait;
3228} 3726}
3229 3727
3230 my $min = 1e6;#d# 3728sub tick {
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer (
3233 reentrant => 0,
3234 parked => 1,
3235 prio => 0,
3236 at => $NEXT_TICK || $TICK,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 if ($Coro::current != $Coro::main) { 3729 if ($Coro::current != $Coro::main) {
3240 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3241 unless ++$bug_warning > 10; 3731 unless ++$bug_warning > 10;
3242 return; 3732 return;
3243 } 3733 }
3244 3734
3245 $NOW = $tick_start = Event::time;
3246
3247 cf::server_tick; # one server iteration 3735 cf::server_tick; # one server iteration
3248 3736
3249 0 && sync_job {#d# 3737 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3250 for(1..10) { 3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3251 my $t = Event::time; 3739 Coro::async_pool {
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3740 $Coro::current->{desc} = "runtime saver";
3253 or die; 3741 write_runtime_sync
3254 3742 or warn "ERROR: unable to write runtime file: $!";
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 }; 3743 };
3744 }
3271 3745
3272 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK;
3274
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool {
3278 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!";
3280 };
3281 }
3282
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3747 $sig->send;
3288 } 3748 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3749 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3750 $sig->send;
3291 } 3751 }
3292 3752
3293 $NOW = Event::time; 3753 $LOAD = ($NOW - $TICK_START) / $TICK;
3294
3295 # if we are delayed by four ticks or more, skip them all
3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298 $TICK_WATCHER->at ($NEXT_TICK);
3299 $TICK_WATCHER->start;
3300
3301 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3755
3304 _post_tick; 3756 if (0) {
3305 3757 if ($NEXT_TICK) {
3306 3758 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d#
3761 }
3307 }, 3762 }
3308); 3763}
3309 3764
3310{ 3765{
3311 BDB::max_poll_time $TICK * 0.1; 3766 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 3767
3313 reentrant => 0,
3314 fd => BDB::poll_fileno,
3315 poll => 'r',
3316 prio => 0,
3317 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb,
3319 );
3320 BDB::min_parallel 8; 3768 BDB::min_parallel 8;
3321 3769 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 3770 $Coro::BDB::WATCHER->priority (1);
3323 my $status;
3324 my $current = $Coro::current;
3325 (
3326 sub {
3327 $status = $!;
3328 $current->ready; undef $current;
3329 },
3330 sub {
3331 Coro::schedule while defined $current;
3332 $! = $status;
3333 },
3334 )
3335 };
3336 3771
3337 unless ($DB_ENV) { 3772 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3773 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3775 | BDB::LOG_AUTOREMOVE, 1);
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3778
3340 cf::sync_job { 3779 cf::sync_job {
3341 eval { 3780 eval {
3342 BDB::db_env_open 3781 BDB::db_env_open
3343 $DB_ENV, 3782 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3784 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3785 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3786 0666;
3348 3787
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3788 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3789 };
3354 3790
3355 cf::cleanup "db_env_open(db): $@" if $@; 3791 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3792 };
3357 } 3793 }
3794
3795 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3796 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3797 };
3798 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3799 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3800 };
3801 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3802 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3803 };
3358} 3804}
3359 3805
3360{ 3806{
3807 # configure IO::AIO
3808
3361 IO::AIO::min_parallel 8; 3809 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 3810 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 3811 $Coro::AIO::WATCHER->priority (1);
3366 reentrant => 0,
3367 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno,
3369 poll => 'r',
3370 prio => 6,
3371 cb => \&IO::AIO::poll_cb,
3372 );
3373} 3812}
3374 3813
3375my $_log_backtrace; 3814my $_log_backtrace;
3376 3815
3377sub _log_backtrace { 3816sub _log_backtrace {
3381 3820
3382 # limit the # of concurrent backtraces 3821 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3822 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3823 ++$_log_backtrace;
3385 async { 3824 async {
3825 $Coro::current->{desc} = "abt $msg";
3826
3386 my @bt = fork_call { 3827 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3828 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3829 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3830 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3831 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines