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.422 by root, Tue Apr 15 20:46:55 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;
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 chmod SAVE_MODE, $fh;
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 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 chmod SAVE_MODE, $fh;
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 close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1159 }
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 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1331 } 1464 }
1332 } 1465 }
1333} 1466}
1334 1467
1343 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1344 1477
1345 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1347 1480
1481 cf::get_slot 0.01;
1482
1348 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1349 Coro::cede; 1484 cf::cede_to_tick;
1350} 1485}
1351 1486
1352sub new($) { 1487sub new($) {
1353 my ($login) = @_; 1488 my ($login) = @_;
1354 1489
1358 $self->{deny_save} = 1; 1493 $self->{deny_save} = 1;
1359 1494
1360 $cf::PLAYER{$login} = $self; 1495 $cf::PLAYER{$login} = $self;
1361 1496
1362 $self 1497 $self
1498}
1499
1500=item $player->send_msg ($channel, $msg, $color, [extra...])
1501
1502=cut
1503
1504sub send_msg {
1505 my $ns = shift->ns
1506 or return;
1507 $ns->send_msg (@_);
1363} 1508}
1364 1509
1365=item $pl->quit_character 1510=item $pl->quit_character
1366 1511
1367Nukes the player without looking back. If logged in, the connection will 1512Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1567 or return [];
1423 1568
1424 my @logins; 1569 my @logins;
1425 1570
1426 for my $login (@$dirs) { 1571 for my $login (@$dirs) {
1572 my $path = path $login;
1573
1574 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1577 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1578 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 }
1430 1580
1431 utf8::decode $login; 1581 utf8::decode $login;
1432 push @logins, $login; 1582 push @logins, $login;
1433 } 1583 }
1434 1584
1467 1617
1468Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1469 1619
1470=cut 1620=cut
1471 1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1472sub expand_cfpod { 1633sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1474 1635
1475 # escape & and < 1636 my $xml;
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478 1637
1479 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1480 1641
1481 1 while 1642 $group =~ s/&/&amp;/g;
1482 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1486 # replace G<male|female> tags 1647 ([BCGHITU])
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1648 <
1488 $self->gender ? $2 : $1 1649 (?:
1489 }ge 1650 ([^<>]*) (?{ $group = $^N })
1490 # replace H<hint text> 1651 | < $interior >
1491 || s{H<([^\>]*)>} 1652 )
1653 >
1654 %gcsx
1492 { 1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "") 1675 "")
1496 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1497 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1498 1687
1688 for ($xml) {
1499 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1501 1691
1502 # compress some whitespace 1692 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1507 1698
1508 $_ 1699 $xml
1509} 1700}
1701
1702no re 'eval';
1510 1703
1511sub hintmode { 1704sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1706 $_[0]{hintmode}
1514} 1707}
1515 1708
1516=item $player->ext_reply ($msgid, %msg) 1709=item $player->ext_reply ($msgid, @msg)
1517 1710
1518Sends an ext reply to the player. 1711Sends an ext reply to the player.
1519 1712
1520=cut 1713=cut
1521 1714
1522sub ext_reply($$%) { 1715sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1716 my ($self, $id, @msg) = @_;
1524 1717
1525 $msg{msgid} = $id; 1718 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1719}
1528 1720
1529=item $player->ext_event ($type, %msg) 1721=item $player->ext_msg ($type, @msg)
1530 1722
1531Sends an ext event to the client. 1723Sends an ext event to the client.
1532 1724
1533=cut 1725=cut
1534 1726
1535sub ext_event($$%) { 1727sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1728 my ($self, $type, @msg) = @_;
1537 1729
1538 $self->ns->ext_event ($type, %msg); 1730 $self->ns->ext_msg ($type, @msg);
1539} 1731}
1540 1732
1541=head3 cf::region 1733=head3 cf::region
1542 1734
1543=over 4 1735=over 4
1587our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1588our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1589 1781
1590sub generate_random_map { 1782sub generate_random_map {
1591 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1592 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1593 $self->_create_random_map ( 1788 $self->_create_random_map (
1594 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1595 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1596 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 1913
1719# the temporary/swap location 1914# the temporary/swap location
1720sub save_path { 1915sub save_path {
1721 my ($self) = @_; 1916 my ($self) = @_;
1722 1917
1723 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1724 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1725} 1920}
1726 1921
1727# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1728sub uniq_path { 1923sub uniq_path {
1729 my ($self) = @_; 1924 my ($self) = @_;
1730 1925
1731 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1732 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1733} 1928}
1734 1929
1735# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1736# all maps in C++... 1931# all maps in C++...
1759 1954
1760sub load_header_from($) { 1955sub load_header_from($) {
1761 my ($self, $path) = @_; 1956 my ($self, $path) = @_;
1762 1957
1763 utf8::encode $path; 1958 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1959 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1960 or return;
1961
1962 $self->_load_header ($f)
1963 or return;
1964
1965 local $MAP_LOADING{$self->{path}} = $self;
1966 $f->resolve_delayed_derefs;
1769 1967
1770 $self->{load_path} = $path; 1968 $self->{load_path} = $path;
1771 1969
1772 1 1970 1
1773} 1971}
1827sub find { 2025sub find {
1828 my ($path, $origin) = @_; 2026 my ($path, $origin) = @_;
1829 2027
1830 $path = normalise $path, $origin && $origin->path; 2028 $path = normalise $path, $origin && $origin->path;
1831 2029
2030 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 2031 cf::lock_wait "map_find:$path";
1833 2032
1834 $cf::MAP{$path} || do { 2033 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
1836 my $map = new_from_path cf::map $path 2037 my $map = new_from_path cf::map $path
1837 or return; 2038 or return;
1838 2039
1839 $map->{last_save} = $cf::RUNTIME; 2040 $map->{last_save} = $cf::RUNTIME;
1840 2041
1842 or return; 2043 or return;
1843 2044
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 2046 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 2047 #$cf::WAIT_FOR_TICK->wait;
2048 undef $guard1;
2049 undef $guard2;
1847 $map->reset; 2050 $map->reset;
1848 undef $guard;
1849 return find $path; 2051 return find $path;
1850 } 2052 }
1851 2053
1852 $cf::MAP{$path} = $map 2054 $cf::MAP{$path} = $map
1853 } 2055 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 2064 local $self->{deny_reset} = 1; # loading can take a long time
1863 2065
1864 my $path = $self->{path}; 2066 my $path = $self->{path};
1865 2067
1866 { 2068 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2069 my $guard = cf::lock_acquire "map_data:$path";
1868 2070
2071 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2072 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2073
1871 $self->in_memory (cf::MAP_LOADING); 2074 $self->in_memory (cf::MAP_LOADING);
1872 2075
1873 $self->alloc; 2076 $self->alloc;
1874 2077
1875 $self->pre_load; 2078 $self->pre_load;
1876 Coro::cede; 2079 cf::cede_to_tick;
1877 2080
2081 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2083 $self->_load_objects ($f)
1879 or return; 2084 or return;
1880 2085
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 2087 if delete $self->{load_original};
1883 2088
1884 if (my $uniq = $self->uniq_path) { 2089 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2090 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2091 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2093 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2094 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs;
2096 }
1889 } 2097 }
1890 } 2098 }
1891 2099
1892 Coro::cede; 2100 $f->resolve_delayed_derefs;
2101
2102 cf::cede_to_tick;
1893 # now do the right thing for maps 2103 # now do the right thing for maps
1894 $self->link_multipart_objects; 2104 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2105 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2106 unless $self->difficulty;
1897 Coro::cede; 2107 cf::cede_to_tick;
1898 2108
1899 unless ($self->{deny_activate}) { 2109 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2110 $self->decay_objects;
1901 $self->fix_auto_apply; 2111 $self->fix_auto_apply;
1902 $self->update_buttons; 2112 $self->update_buttons;
1903 Coro::cede; 2113 cf::cede_to_tick;
1904 $self->set_darkness_map; 2114 $self->set_darkness_map;
1905 Coro::cede; 2115 cf::cede_to_tick;
1906 $self->activate; 2116 $self->activate;
1907 } 2117 }
1908 2118
2119 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME);
2121
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1910 } 2123 }
1911 2124
1912 $self->post_load; 2125 $self->post_load;
1913} 2126}
1914 2127
1923 2136
1924 $self 2137 $self
1925} 2138}
1926 2139
1927# find and load all maps in the 3x3 area around a map 2140# find and load all maps in the 3x3 area around a map
1928sub load_diag { 2141sub load_neighbours {
1929 my ($map) = @_; 2142 my ($map) = @_;
1930 2143
1931 my @diag; # diagonal neighbours 2144 my @neigh; # diagonal neighbours
1932 2145
1933 for (0 .. 3) { 2146 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2147 my $neigh = $map->tile_path ($_)
1935 or next; 2148 or next;
1936 $neigh = find $neigh, $map 2149 $neigh = find $neigh, $map
1937 or next; 2150 or next;
1938 $neigh->load; 2151 $neigh->load;
1939 2152
2153 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2156 }
1943 2157
1944 for (@diag) { 2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2160 my $neigh = find $path, $origin
1946 or next; 2161 or next;
1947 $neigh->load; 2162 $neigh->load;
1948 } 2163 }
1949} 2164}
1950 2165
1955} 2170}
1956 2171
1957sub do_load_sync { 2172sub do_load_sync {
1958 my ($map) = @_; 2173 my ($map) = @_;
1959 2174
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main;
2177
1960 cf::sync_job { $map->load }; 2178 cf::sync_job { $map->load };
1961} 2179}
1962 2180
1963our %MAP_PREFETCH; 2181our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2182our $MAP_PREFETCHER = undef;
1965 2183
1966sub find_async { 2184sub find_async {
1967 my ($path, $origin) = @_; 2185 my ($path, $origin, $load) = @_;
1968 2186
1969 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
1970 2188
1971 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2191 }
1974 2192
1975 undef $MAP_PREFETCH{$path}; 2193 $MAP_PREFETCH{$path} |= $load;
2194
1976 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
1977 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2200 if (my $map = find $k) {
1980 $map->load; 2201 $map->load if $v;
1981 } 2202 }
1982 2203
1983 delete $MAP_PREFETCH{$path}; 2204 delete $MAP_PREFETCH{$k};
1984 } 2205 }
1985 } 2206 }
1986 undef $MAP_PREFETCHER; 2207 undef $MAP_PREFETCHER;
1987 }; 2208 };
1988 $MAP_PREFETCHER->prio (6); 2209 $MAP_PREFETCHER->prio (6);
1991} 2212}
1992 2213
1993sub save { 2214sub save {
1994 my ($self) = @_; 2215 my ($self) = @_;
1995 2216
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2218
1998 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
1999 2220
2000 return unless $self->dirty; 2221 return unless $self->dirty;
2001 2222
2007 return if $self->{deny_save}; 2228 return if $self->{deny_save};
2008 2229
2009 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
2010 2231
2011 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2013 }; 2235 };
2236
2237 cf::get_slot 0.02;
2014 2238
2015 if ($uniq) { 2239 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2242 } else {
2024 my ($self) = @_; 2248 my ($self) = @_;
2025 2249
2026 # save first because save cedes 2250 # save first because save cedes
2027 $self->save; 2251 $self->save;
2028 2252
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2254
2031 return if $self->players; 2255 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2034 2258
2259 $self->in_memory (cf::MAP_SWAPPED);
2260
2261 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2263 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2264}
2038 2265
2039sub reset_at { 2266sub reset_at {
2040 my ($self) = @_; 2267 my ($self) = @_;
2041 2268
2073 if $uniq; 2300 if $uniq;
2074 } 2301 }
2075 2302
2076 delete $cf::MAP{$self->path}; 2303 delete $cf::MAP{$self->path};
2077 2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2307 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2308
2082 $self->unlink_save; 2309 $self->unlink_save;
2083 $self->destroy; 2310 $self->destroy;
2084} 2311}
2085 2312
2086my $nuke_counter = "aaaa"; 2313my $nuke_counter = "aaaa";
2087 2314
2088sub nuke { 2315sub nuke {
2089 my ($self) = @_; 2316 my ($self) = @_;
2090 2317
2318 {
2319 my $lock = cf::lock_acquire "map_data:$self->{path}";
2320
2091 delete $cf::MAP{$self->path}; 2321 delete $cf::MAP{$self->path};
2092 2322
2093 $self->unlink_save; 2323 $self->unlink_save;
2094 2324
2095 bless $self, "cf::map"; 2325 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2326 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2327 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2328 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2330
2101 $cf::MAP{$self->path} = $self; 2331 $cf::MAP{$self->path} = $self;
2332 }
2102 2333
2103 $self->reset; # polite request, might not happen 2334 $self->reset; # polite request, might not happen
2104} 2335}
2105 2336
2106=item $maps = cf::map::tmp_maps 2337=item $maps = cf::map::tmp_maps
2148 2379
2149sub unique_maps() { 2380sub unique_maps() {
2150 [ 2381 [
2151 map { 2382 map {
2152 utf8::decode $_; 2383 utf8::decode $_;
2153 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2154 ? normalise $_ 2387 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2389 ]
2158} 2390}
2159 2391
2160package cf;
2161
2162=back 2392=back
2163 2393
2164=head3 cf::object 2394=head3 cf::object
2165 2395
2166=cut 2396=cut
2169 2399
2170=over 4 2400=over 4
2171 2401
2172=item $ob->inv_recursive 2402=item $ob->inv_recursive
2173 2403
2174Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2175 2406
2176=cut 2407=cut
2177 2408
2178sub inv_recursive_; 2409sub inv_recursive_;
2179sub inv_recursive_ { 2410sub inv_recursive_ {
2180 map { $_, inv_recursive_ $_->inv } @_ 2411 map { $_, inv_recursive_ $_->inv } @_
2181} 2412}
2182 2413
2183sub inv_recursive { 2414sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2416}
2417
2418=item $ref = $ob->ref
2419
2420Creates and returns a persistent reference to an object that can be stored as a string.
2421
2422=item $ob = cf::object::deref ($refstring)
2423
2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2425even if the object actually exists. May block.
2426
2427=cut
2428
2429sub deref {
2430 my ($ref) = @_;
2431
2432 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2433 my ($uuid, $name) = ($1, $2);
2434 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2435 or return;
2436 $pl->ob->uuid eq $uuid
2437 or return;
2438
2439 $pl->ob
2440 } else {
2441 warn "$ref: cannot resolve object reference\n";
2442 undef
2443 }
2185} 2444}
2186 2445
2187package cf; 2446package cf;
2188 2447
2189=back 2448=back
2213 2472
2214 } else { 2473 } else {
2215 my $pl = $self->contr; 2474 my $pl = $self->contr;
2216 2475
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2476 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2478 $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 2479
2226 } else { 2480 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2482 $self->message ($msg, $flags);
2229 } 2483 }
2230 } 2484 }
2485}
2486
2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2488
2489=cut
2490
2491sub cf::object::send_msg {
2492 my $pl = shift->contr
2493 or return;
2494 $pl->send_msg (@_);
2231} 2495}
2232 2496
2233=item $player_object->may ("access") 2497=item $player_object->may ("access")
2234 2498
2235Returns wether the given player is authorized to access resource "access" 2499Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2578 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2579 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2580 if $x <=0 && $y <= 0;
2317 2581
2318 $map->load; 2582 $map->load;
2319 $map->load_diag; 2583 $map->load_neighbours;
2320 2584
2321 return unless $self->contr->active; 2585 return unless $self->contr->active;
2322 $self->activate_recursive; 2586 $self->activate_recursive;
2323 2587
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2609
2346 $self->enter_link; 2610 $self->enter_link;
2347 2611
2348 (async { 2612 (async {
2613 $Coro::current->{desc} = "player::goto $path $x $y";
2614
2615 # *tag paths override both path and x|y
2616 if ($path =~ /^\*(.*)$/) {
2617 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2618 my $ob = $obs[rand @obs];
2619
2620 # see if we actually can go there
2621 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2622 $ob = $obs[rand @obs];
2623 } else {
2624 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2625 }
2626 # else put us there anyways for now #d#
2627
2628 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2629 } else {
2630 ($path, $x, $y) = (undef, undef, undef);
2631 }
2632 }
2633
2349 my $map = eval { 2634 my $map = eval {
2350 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2351 2636
2352 if ($map) { 2637 if ($map) {
2353 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2355 } else { 2640 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2642 }
2358 2643
2359 $map 2644 $map
2360 }; 2645 };
2361 2646
2414 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2415 } 2700 }
2416 2701
2417 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2418 2703
2419 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2422 2707
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2451 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2454 2739
2455 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2456 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2744 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2459 2746
2460 1; 2747 1;
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2782the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2497 2784
2498=cut 2785=cut
2499 2786
2787# non-persistent channels (usually the info channel)
2788our %CHANNEL = (
2789 "c/identify" => {
2790 id => "infobox",
2791 title => "Identify",
2792 reply => undef,
2793 tooltip => "Items recently identified",
2794 },
2795 "c/examine" => {
2796 id => "infobox",
2797 title => "Examine",
2798 reply => undef,
2799 tooltip => "Signs and other items you examined",
2800 },
2801 "c/book" => {
2802 id => "infobox",
2803 title => "Book",
2804 reply => undef,
2805 tooltip => "The contents of a note or book",
2806 },
2807 "c/lookat" => {
2808 id => "infobox",
2809 title => "Look",
2810 reply => undef,
2811 tooltip => "What you saw there",
2812 },
2813 "c/who" => {
2814 id => "infobox",
2815 title => "Players",
2816 reply => undef,
2817 tooltip => "Shows players who are currently online",
2818 },
2819 "c/body" => {
2820 id => "infobox",
2821 title => "Body Parts",
2822 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available",
2824 },
2825 "c/uptime" => {
2826 id => "infobox",
2827 title => "Uptime",
2828 reply => undef,
2829 tooltip => "How long the server has been running since last restart",
2830 },
2831 "c/mapinfo" => {
2832 id => "infobox",
2833 title => "Map Info",
2834 reply => undef,
2835 tooltip => "Information related to the maps",
2836 },
2837);
2838
2500sub cf::client::send_msg { 2839sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2841
2503 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg);
2504 2843
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2844 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2845
2846 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel};
2849
2850 $self->ext_msg (channel_info => $channel)
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id};
2854
2507 if (ref $channel) { 2855 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2856 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2857 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2858 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2859 $self->ext_msg (channel_info => $channel)
2860 if $self->can_msg;
2512 } 2861 }
2513 2862
2514 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2515 } 2864 }
2516 2865
2517 return unless @extra || length $msg; 2866 return unless @extra || length $msg;
2518 2867
2519 if ($self->can_msg) { 2868 if ($self->can_msg) {
2869 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF;
2872
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2873 $self->send_packet ("msg " . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2875 } 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) { 2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886
2887 $color &= cf::NDI_COLOR_MASK;
2888
2889 utf8::encode $msg;
2890
2533 if (0 && $msg =~ /\[/) { 2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2894 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2896 $self->send_packet ("drawinfo $color $msg")
2538 } 2897 }
2539 } 2898 }
2540 } 2899 }
2541} 2900}
2542 2901
2543=item $client->ext_event ($type, %msg) 2902=item $client->ext_msg ($type, @msg)
2544 2903
2545Sends an ext event to the client. 2904Sends an ext event to the client.
2546 2905
2547=cut 2906=cut
2548 2907
2549sub cf::client::ext_event($$%) { 2908sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2909 my ($self, $type, @msg) = @_;
2551 2910
2552 return unless $self->extcmd; 2911 if ($self->extcmd == 2) {
2553 2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2914 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 }
2917}
2918
2919=item $client->ext_reply ($msgid, @msg)
2920
2921Sends an ext reply to the client.
2922
2923=cut
2924
2925sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_;
2927
2928 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2556} 2935}
2557 2936
2558=item $success = $client->query ($flags, "text", \&cb) 2937=item $success = $client->query ($flags, "text", \&cb)
2559 2938
2560Queues a query to the client, calling the given callback with 2939Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2994 my ($ns, $buf) = @_;
2616 2995
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2996 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2997
2619 if (ref $msg) { 2998 if (ref $msg) {
2999 my ($type, $reply, @payload) =
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003
3004 my @reply;
3005
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3006 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 3007 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 3008 }
3009
3010 $ns->ext_reply ($reply, @reply)
3011 if $reply;
3012
2626 } else { 3013 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 3015 }
2629 3016
2630 cf::override; 3017 cf::override;
2677our $safe = new Safe "safe"; 3064our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3065our $safe_hole = new Safe::Hole;
2679 3066
2680$SIG{FPE} = 'IGNORE'; 3067$SIG{FPE} = 'IGNORE';
2681 3068
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3069$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math
3071 grepstart grepwhile mapstart mapwhile
3072 sort time
3073));
2683 3074
2684# here we export the classes and methods available to script code 3075# here we export the classes and methods available to script code
2685 3076
2686=pod 3077=pod
2687 3078
2688The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
2689 3080
2690 cf::object 3081 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3082 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3083 insert remove name archname title slaying race decrease_ob_nr
2693 3084
2694 cf::object::player 3085 cf::object::player
2695 player 3086 player
2696 3087
2697 cf::player 3088 cf::player
2702 3093
2703=cut 3094=cut
2704 3095
2705for ( 3096for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race
2707 insert remove)], 3099 decrease_ob_nr destroy)],
2708 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2711) { 3103) {
2712 no strict 'refs'; 3104 no strict 'refs';
2788# the server's init and main functions 3180# the server's init and main functions
2789 3181
2790sub load_facedata($) { 3182sub load_facedata($) {
2791 my ($path) = @_; 3183 my ($path) = @_;
2792 3184
3185 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = ();
3188
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190
2793 warn "loading facedata from $path\n"; 3191 warn "loading facedata from $path\n";
2794 3192
2795 my $facedata; 3193 my $facedata;
2796 0 < aio_load $path, $facedata 3194 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3195 or die "$path: $!";
2799 $facedata = Coro::Storable::thaw $facedata; 3197 $facedata = Coro::Storable::thaw $facedata;
2800 3198
2801 $facedata->{version} == 2 3199 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3200 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 3201
3202 # patch in the exptable
3203 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3206 };
3207 cf::cede_to_tick;
3208
2804 { 3209 {
2805 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
2806 3211
2807 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
2809 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3219
2814 cf::cede_to_tick; 3220 cf::cede_to_tick;
2815 } 3221 }
2816 3222
2817 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
2819 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
2820 or next; 3227 or next;
3228
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3232 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
2842 3250
2843 { 3251 {
2844 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3255
2849 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3257 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; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
2857 3260
2858 if ($name =~ /\.jpg$/) { 3261 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3262 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
2861 } else { 3276 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3277 $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 } 3278 }
2868 3279
2869 cf::cede_to_tick; 3280 cf::cede_to_tick;
2870 } 3281 }
2871 } 3282 }
2872 3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285
2873 1 3286 1
2874} 3287}
2875 3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308
3309register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_;
3311
3312 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v);
3314 }
3315};
3316
2876sub reload_regions { 3317sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = ();
3321
2877 load_resource_file "$MAPDIR/regions" 3322 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3323 or die "unable to load regions file\n";
2879 3324
2880 for (cf::region::list) { 3325 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3326 $_->{match} = qr/$_->{match}/
2917 3362
2918sub init { 3363sub init {
2919 reload_resources; 3364 reload_resources;
2920} 3365}
2921 3366
2922sub cfg_load { 3367sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3369 or return;
2925 3370
2926 local $/; 3371 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3372 *CFG = YAML::Load <$fh>;
2928 3373
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2930 3375
2931 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3376 $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}; 3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2943sub main { 3388sub main {
2944 # we must not ever block the main coroutine 3389 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3390 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3392 (async {
2948 Event::one_event; 3393 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3395 })->prio (Coro::PRIO_MAX);
2950 }; 3396 };
2951 3397
2952 cfg_load; 3398 reload_config;
2953 db_init; 3399 db_init;
2954 load_extensions; 3400 load_extensions;
2955 3401
2956 $TICK_WATCHER->start; 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno;
2957 Event::loop; 3404 EV::loop;
2958} 3405}
2959 3406
2960############################################################################# 3407#############################################################################
2961# initialisation and cleanup 3408# initialisation and cleanup
2962 3409
2963# install some emergency cleanup handlers 3410# install some emergency cleanup handlers
2964BEGIN { 3411BEGIN {
3412 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3413 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3414 $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"; 3415 cf::cleanup "SIG$signal";
2973 },
2974 ); 3416 };
2975 } 3417 }
2976} 3418}
2977 3419
2978sub write_runtime { 3420sub write_runtime_sync {
2979 my $runtime = "$LOCALDIR/runtime"; 3421 my $runtime = "$LOCALDIR/runtime";
2980 3422
2981 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
2983 3425
3009 and return; 3451 and return;
3010 3452
3011 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3012 3454
3013 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3014} 3499}
3015 3500
3016sub emergency_save() { 3501sub emergency_save() {
3017 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3018 3503
3024 # and maps saved/destroyed asynchronously. 3509 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3510 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3511 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3512 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3513 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3515 $pl->save;
3030 } 3516 }
3031 warn "end emergency player save\n"; 3517 warn "end emergency player save\n";
3032 3518
3033 warn "begin emergency map save\n"; 3519 warn "begin emergency map save\n";
3039 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3040 3526
3041 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3042 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3043 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3044 }; 3534 };
3045 3535
3046 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3047} 3537}
3048 3538
3063 warn "reloading..."; 3553 warn "reloading...";
3064 3554
3065 warn "entering sync_job"; 3555 warn "entering sync_job";
3066 3556
3067 cf::sync_job { 3557 cf::sync_job {
3068 cf::write_runtime; # external watchdog should not bark 3558 cf::write_runtime_sync; # external watchdog should not bark
3069 cf::emergency_save; 3559 cf::emergency_save;
3070 cf::write_runtime; # external watchdog should not bark 3560 cf::write_runtime_sync; # external watchdog should not bark
3071 3561
3072 warn "syncing database to disk"; 3562 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV; 3563 BDB::db_env_txn_checkpoint $DB_ENV;
3074 3564
3075 # if anything goes wrong in here, we should simply crash as we already saved 3565 # 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 3566
3082 warn "flushing outstanding aio requests"; 3567 warn "flushing outstanding aio requests";
3083 for (;;) { 3568 for (;;) {
3084 BDB::flush; 3569 BDB::flush;
3085 IO::AIO::flush; 3570 IO::AIO::flush;
3086 Coro::cede; 3571 Coro::cede_notself;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3572 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate..."; 3573 warn "iterate...";
3089 } 3574 }
3090 3575
3091 ++$RELOAD; 3576 ++$RELOAD;
3150 warn "reloading cf.pm"; 3635 warn "reloading cf.pm";
3151 require cf; 3636 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3638
3154 warn "loading config and database again"; 3639 warn "loading config and database again";
3155 cf::cfg_load; 3640 cf::reload_config;
3156 3641
3157 warn "loading extensions"; 3642 warn "loading extensions";
3158 cf::load_extensions; 3643 cf::load_extensions;
3159 3644
3160 warn "reattaching attachments to objects/players"; 3645 warn "reattaching attachments to objects/players";
3167 warn "leaving sync_job"; 3652 warn "leaving sync_job";
3168 3653
3169 1 3654 1
3170 } or do { 3655 } or do {
3171 warn $@; 3656 warn $@;
3172 warn "error while reloading, exiting."; 3657 cf::cleanup "error while reloading, exiting.";
3173 exit 1;
3174 }; 3658 };
3175 3659
3176 warn "reloaded"; 3660 warn "reloaded";
3177}; 3661};
3178 3662
3180 3664
3181sub reload_perl() { 3665sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3184 3668
3185 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3186 reentrant => 0,
3187 after => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => sub {
3190 do_reload_perl; 3670 do_reload_perl;
3191 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3192 },
3193 ); 3672 };
3194} 3673}
3195 3674
3196register_command "reload" => sub { 3675register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3198 3677
3199 if ($who->flag (FLAG_WIZ)) { 3678 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3679 $who->message ("reloading server.");
3680 async {
3681 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3682 reload_perl;
3683 };
3202 } 3684 }
3203}; 3685};
3204 3686
3205unshift @INC, $LIBDIR; 3687unshift @INC, $LIBDIR;
3206 3688
3208 3690
3209our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3210our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3211 3693
3212sub wait_for_tick { 3694sub wait_for_tick {
3213 return unless $TICK_WATCHER->is_active; 3695 return if tick_inhibit;
3214 return if $Coro::current == $Coro::main; 3696 return if $Coro::current == $Coro::main;
3215 3697
3216 my $signal = new Coro::Signal; 3698 my $signal = new Coro::Signal;
3217 push @WAIT_FOR_TICK, $signal; 3699 push @WAIT_FOR_TICK, $signal;
3218 $signal->wait; 3700 $signal->wait;
3219} 3701}
3220 3702
3221sub wait_for_tick_begin { 3703sub wait_for_tick_begin {
3222 return unless $TICK_WATCHER->is_active; 3704 return if tick_inhibit;
3223 return if $Coro::current == $Coro::main; 3705 return if $Coro::current == $Coro::main;
3224 3706
3225 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3708 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3709 $signal->wait;
3228} 3710}
3229 3711
3230 my $min = 1e6;#d# 3712sub 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) { 3713 if ($Coro::current != $Coro::main) {
3240 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3714 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3241 unless ++$bug_warning > 10; 3715 unless ++$bug_warning > 10;
3242 return; 3716 return;
3243 } 3717 }
3244 3718
3245 $NOW = $tick_start = Event::time;
3246
3247 cf::server_tick; # one server iteration 3719 cf::server_tick; # one server iteration
3248 3720
3249 0 && sync_job {#d# 3721 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3250 for(1..10) { 3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3251 my $t = Event::time; 3723 Coro::async_pool {
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3724 $Coro::current->{desc} = "runtime saver";
3253 or die; 3725 write_runtime_sync
3254 3726 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 }; 3727 };
3728 }
3271 3729
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) { 3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3731 $sig->send;
3288 } 3732 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3733 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3734 $sig->send;
3291 } 3735 }
3292 3736
3293 $NOW = Event::time; 3737 $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; 3738 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3739
3304 _post_tick; 3740 if (0) {
3305 3741 if ($NEXT_TICK) {
3306 3742 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d#
3745 }
3307 }, 3746 }
3308); 3747}
3309 3748
3310{ 3749{
3311 BDB::max_poll_time $TICK * 0.1; 3750 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 3751
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; 3752 BDB::min_parallel 8;
3321 3753 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 3754 $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 3755
3337 unless ($DB_ENV) { 3756 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3757 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3759 | BDB::LOG_AUTOREMOVE, 1);
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3762
3340 cf::sync_job { 3763 cf::sync_job {
3341 eval { 3764 eval {
3342 BDB::db_env_open 3765 BDB::db_env_open
3343 $DB_ENV, 3766 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3768 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3769 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3770 0666;
3348 3771
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3772 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 }; 3773 };
3354 3774
3355 cf::cleanup "db_env_open(db): $@" if $@; 3775 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3776 };
3357 } 3777 }
3778
3779 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3780 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3781 };
3782 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3783 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3784 };
3785 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3786 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3787 };
3358} 3788}
3359 3789
3360{ 3790{
3791 # configure IO::AIO
3792
3361 IO::AIO::min_parallel 8; 3793 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 3794 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 3795 $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} 3796}
3374 3797
3375my $_log_backtrace; 3798my $_log_backtrace;
3376 3799
3377sub _log_backtrace { 3800sub _log_backtrace {
3381 3804
3382 # limit the # of concurrent backtraces 3805 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3806 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3807 ++$_log_backtrace;
3385 async { 3808 async {
3809 $Coro::current->{desc} = "abt $msg";
3810
3386 my @bt = fork_call { 3811 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3812 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3813 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3814 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3815 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines