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.319 by root, Tue Jul 24 15:56:45 2007 UTC vs.
Revision 1.428 by root, Thu May 1 06:33:19 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines