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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.418 by root, Fri Apr 11 21:09:53 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;
57use Digest::MD5 ();
34 58
35# configure various modules to our taste 59# configure various modules to our taste
36# 60#
37$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$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
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 104our $DB_ENV;
84 105
85our %CFG; 106our %CFG;
86 107
87our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 109our $RUNTIME;
110our $NOW;
89 111
90our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
93 115
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 118
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
100 123
101binmode STDOUT; 124binmode STDOUT;
102binmode STDERR; 125binmode STDERR;
103 126
104# read virtual server time, if available 127# read virtual server time, if available
157 180
158The raw value load value from the last tick. 181The raw value load value from the last tick.
159 182
160=item %cf::CFG 183=item %cf::CFG
161 184
162Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 186from wherever your confdir points to.
164 187
165=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
166 189
167These 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
168returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
171=back 200=back
172 201
173=cut 202=cut
174 203
175BEGIN { 204BEGIN {
179 $msg .= "\n" 208 $msg .= "\n"
180 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
181 210
182 $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;
183 212
184 utf8::encode $msg;
185 LOG llevError, $msg; 213 LOG llevError, $msg;
186 }; 214 };
187} 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#?
188 231
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 248)) {
206 no strict 'refs'; 249 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 251}
209 252
210$Event::DIED = sub { 253$EV::DIED = sub {
211 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
212}; 255};
213 256
214############################################################################# 257#############################################################################
215 258
238 $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;
239 $d 282 $d
240 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
241} 284}
242 285
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
250 293
251=cut 294=cut
252 295
253our $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
254 297
255sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
257 300
258=item cf::lock_wait $string 301=item cf::lock_wait $string
259 302
260Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
261 304
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
267returned. 310returned.
268 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
269Lock 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
270uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
271 317
272=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
273 319
274Return 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.
275 321
276=cut 322=cut
277 323
278our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
279 326
280sub lock_wait($) { 327sub lock_wait($) {
281 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#
282 334
283 # wait for lock, if any 335 # wait for lock, if any
284 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 338 Coro::schedule;
292 344
293 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
294 lock_wait $key; 346 lock_wait $key;
295 347
296 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
297 350
298 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
301 } 355 }
302} 356}
303 357
306 360
307 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
308} 362}
309 363
310sub freeze_mainloop { 364sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
312 366
313 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
314 $TICK_WATCHER->start; 368}
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
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
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
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
315 }; 428 }
316 $TICK_WATCHER->stop; 429};
317 $guard 430
431sub get_slot($;$$) {
432 my ($time, $pri, $name) = @_;
433
434 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal;
436
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready;
440 $sig->wait;
318} 441}
319 442
320=item cf::async { BLOCK } 443=item cf::async { BLOCK }
321 444
322Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
327 450
328BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
329 452
330=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
331 454
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 458acceptable.
336 459
337If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
343 466
344sub sync_job(&) { 467sub sync_job(&) {
345 my ($job) = @_; 468 my ($job) = @_;
346 469
347 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 471 my $time = EV::time;
349 472
350 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
352 475
353 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 477
355 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
356 479
357 my $busy = 1; 480 my $busy = 1;
358 my @res; 481 my @res;
359 482
360 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 485 @res = eval { $job->() };
362 warn $@ if $@; 486 warn $@ if $@;
363 undef $busy; 487 undef $busy;
364 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
365 489
366 while ($busy) { 490 while ($busy) {
367 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
368 } 495 }
496 }
369 497
370 $time = Event::time - $time; 498 my $time = EV::time - $time;
371 499
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
376 501
377 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
378 } else { 503 } else {
379 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
380 505
405=item fork_call { }, $args 530=item fork_call { }, $args
406 531
407Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
411 536
412=cut 537=cut
413 538
414sub fork_call(&@) { 539sub fork_call(&@) {
415 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
416 541
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 545
422 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 547 reset_signals;
435 local $SIG{__WARN__}; 548 &$cb
436 local $SIG{__DIE__}; 549 }, @args;
437 eval {
438 close $fh1;
439 550
440 my @res = eval { $cb->(@args) }; 551 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 552}
442 };
443 553
444 warn $@ if $@; 554=item $coin = coin_from_name $name
445 _exit 0; 555
446 } 556=cut
557
558our %coin_alias = (
559 "silver" => "silvercoin",
560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
447} 579}
448 580
449=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
450 582
451Returns a single value from the environment database. 583Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
454 586
455Stores the given C<$value> in the family. It can currently store binary 587Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 588data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 589
590=item $db = cf::db_table "name"
591
592Create and/or open a new database table. The string must not be "db" and must be unique
593within each server.
594
458=cut 595=cut
596
597sub db_table($) {
598 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV;
600
601 eval {
602 $db->set_flags (BDB::CHKSUM);
603
604 utf8::encode $name;
605 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
606 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
607 cf::cleanup "db_open(db): $!" if $!;
608 };
609 cf::cleanup "db_open(db): $@" if $@;
610
611 $db
612}
459 613
460our $DB; 614our $DB;
461 615
462sub db_init { 616sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 617 cf::sync_job {
467 eval { 618 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 619 };
477} 620}
478 621
479sub db_get($$) { 622sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
481 624
531 if (1) { 674 if (1) {
532 $md5 = 675 $md5 =
533 join "\x00", 676 join "\x00",
534 $processversion, 677 $processversion,
535 map { 678 map {
536 Coro::cede; 679 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 680 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 681 } 0.. $#$src;
539 682
540 683
541 my $dbmd5 = db_get cache => "$id/md5"; 684 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
587 730
588In the following description, CLASS can be any of C<global>, C<object> 731In the following description, CLASS can be any of C<global>, C<object>
589C<player>, C<client> or C<map> (i.e. the attachable objects in 732C<player>, C<client> or C<map> (i.e. the attachable objects in
590Crossfire TRT). 733Deliantra).
591 734
592=over 4 735=over 4
593 736
594=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
595 738
847 "; 990 ";
848 die if $@; 991 die if $@;
849} 992}
850 993
851our $override; 994our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 995our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 996
854sub override { 997sub override {
855 $override = 1; 998 $override = 1;
856 @invoke_results = (); 999 @INVOKE_RESULTS = (@_);
857} 1000}
858 1001
859sub do_invoke { 1002sub do_invoke {
860 my $event = shift; 1003 my $event = shift;
861 my $callbacks = shift; 1004 my $callbacks = shift;
862 1005
863 @invoke_results = (); 1006 @INVOKE_RESULTS = ();
864 1007
865 local $override; 1008 local $override;
866 1009
867 for (@$callbacks) { 1010 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1011 eval { &{$_->[1]} };
877 } 1020 }
878 1021
879 0 1022 0
880} 1023}
881 1024
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1026
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1028
886Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
887 1030
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1031This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 1032removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 1033results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1034
892=back 1035=back
893 1036
894=cut 1037=cut
895 1038
896############################################################################# 1039#############################################################################
897# object support 1040# object support
1041
1042sub _object_equal($$);
1043sub _object_equal($$) {
1044 my ($a, $b) = @_;
1045
1046 return 0 unless (ref $a) eq (ref $b);
1047
1048 if ("HASH" eq ref $a) {
1049 my @ka = keys %$a;
1050 my @kb = keys %$b;
1051
1052 return 0 if @ka != @kb;
1053
1054 for (0 .. $#ka) {
1055 return 0 unless $ka[$_] eq $kb[$_];
1056 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1057 }
1058
1059 } elsif ("ARRAY" eq ref $a) {
1060
1061 return 0 if @$a != @$b;
1062
1063 for (0 .. $#$a) {
1064 return 0 unless _object_equal $a->[$_], $b->[$_];
1065 }
1066
1067 } elsif ($a ne $b) {
1068 return 0;
1069 }
1070
1071 1
1072}
1073
1074our $SLOW_MERGES;#d#
1075sub _can_merge {
1076 my ($ob1, $ob2) = @_;
1077
1078 ++$SLOW_MERGES;#d#
1079
1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
1082}
898 1083
899sub reattach { 1084sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1086 my ($obj) = @_;
902 1087
923cf::attachable->attach ( 1108cf::attachable->attach (
924 prio => -1000000, 1109 prio => -1000000,
925 on_instantiate => sub { 1110 on_instantiate => sub {
926 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
927 1112
928 $data = from_json $data; 1113 $data = decode_json $data;
929 1114
930 for (@$data) { 1115 for (@$data) {
931 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
932 1117
933 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1134sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
951 1136
952 sync_job { 1137 sync_job {
953 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
956 1142
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1147 close $fh;
962 1148
963 if (@$objs) { 1149 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1155 close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
971 } 1157 }
979 } 1165 }
980 } else { 1166 } else {
981 aio_unlink $filename; 1167 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
983 } 1169 }
984 } 1170 };
985} 1171}
986 1172
987sub object_freezer_as_string { 1173sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
989 1175
1001 or return; 1187 or return;
1002 1188
1003 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1191 or return;
1192
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1007 } 1195 }
1008 1196
1197 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1011 return ($data, $av); 1201 ($data, $av)
1012} 1202}
1013 1203
1014=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1015 1205
1016=over 4 1206=over 4
1089 my ($pl, $buf) = @_; 1279 my ($pl, $buf) = @_;
1090 1280
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1281 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1282
1093 if (ref $msg) { 1283 if (ref $msg) {
1284 my ($type, $reply, @payload) =
1285 "ARRAY" eq ref $msg
1286 ? @$msg
1287 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1288
1289 my @reply;
1290
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1291 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1292 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1293 }
1294
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1099 } else { 1298 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1300 }
1102 1301
1103 cf::override; 1302 cf::override;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1158 1357
1159 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1359 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1361 }
1164 1362
1165 warn $msg; 1363 warn $msg;
1166 } 1364 }
1167 1365
1192use Coro::AIO; 1390use Coro::AIO;
1193 1391
1194=head3 cf::player 1392=head3 cf::player
1195 1393
1196=over 4 1394=over 4
1395
1396=item cf::player::num_playing
1397
1398Returns the official number of playing players, as per the Crossfire metaserver rules.
1399
1400=cut
1401
1402sub num_playing {
1403 scalar grep
1404 $_->ob->map
1405 && !$_->hidden
1406 && !$_->ob->flag (cf::FLAG_WIZ),
1407 cf::player::list
1408}
1197 1409
1198=item cf::player::find $login 1410=item cf::player::find $login
1199 1411
1200Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1201 1413
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1453
1242 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1455 or return;
1456
1457 my $pl = cf::player::load_pl $f
1458 or return;
1459 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1245 } 1462 }
1246 } 1463 }
1247} 1464}
1248 1465
1258 1475
1259 aio_mkdir playerdir $pl, 0770; 1476 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1477 $pl->{last_save} = $cf::RUNTIME;
1261 1478
1262 $pl->save_pl ($path); 1479 $pl->save_pl ($path);
1263 Coro::cede; 1480 cf::cede_to_tick;
1264} 1481}
1265 1482
1266sub new($) { 1483sub new($) {
1267 my ($login) = @_; 1484 my ($login) = @_;
1268 1485
1272 $self->{deny_save} = 1; 1489 $self->{deny_save} = 1;
1273 1490
1274 $cf::PLAYER{$login} = $self; 1491 $cf::PLAYER{$login} = $self;
1275 1492
1276 $self 1493 $self
1494}
1495
1496=item $player->send_msg ($channel, $msg, $color, [extra...])
1497
1498=cut
1499
1500sub send_msg {
1501 my $ns = shift->ns
1502 or return;
1503 $ns->send_msg (@_);
1277} 1504}
1278 1505
1279=item $pl->quit_character 1506=item $pl->quit_character
1280 1507
1281Nukes the player without looking back. If logged in, the connection will 1508Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1563 or return [];
1337 1564
1338 my @logins; 1565 my @logins;
1339 1566
1340 for my $login (@$dirs) { 1567 for my $login (@$dirs) {
1568 my $path = path $login;
1569
1570 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1344 1576
1345 utf8::decode $login; 1577 utf8::decode $login;
1346 push @logins, $login; 1578 push @logins, $login;
1347 } 1579 }
1348 1580
1381 1613
1382Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1383 1615
1384=cut 1616=cut
1385 1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1386sub expand_cfpod { 1629sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1388 1631
1389 # escape & and < 1632 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1633
1393 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1394 1637
1395 1 while 1638 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1643 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1644 <
1402 $self->gender ? $2 : $1 1645 (?:
1403 }ge 1646 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1647 | < $interior >
1405 || s{H<([^\>]*)>} 1648 )
1649 >
1650 %gcsx
1406 { 1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1671 "")
1410 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1412 1683
1684 for ($xml) {
1413 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1415 1687
1416 # compress some whitespace 1688 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1418 1694
1419 $_ 1695 $xml
1420} 1696}
1697
1698no re 'eval';
1421 1699
1422sub hintmode { 1700sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode} 1702 $_[0]{hintmode}
1425} 1703}
1426 1704
1427=item $player->ext_reply ($msgid, %msg) 1705=item $player->ext_reply ($msgid, @msg)
1428 1706
1429Sends an ext reply to the player. 1707Sends an ext reply to the player.
1430 1708
1431=cut 1709=cut
1432 1710
1433sub ext_reply($$%) { 1711sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1712 my ($self, $id, @msg) = @_;
1435 1713
1436 $msg{msgid} = $id; 1714 $self->ns->ext_reply ($id, @msg)
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438} 1715}
1439 1716
1440=item $player->ext_event ($type, %msg) 1717=item $player->ext_msg ($type, @msg)
1441 1718
1442Sends an ext event to the client. 1719Sends an ext event to the client.
1443 1720
1444=cut 1721=cut
1445 1722
1446sub ext_event($$%) { 1723sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1724 my ($self, $type, @msg) = @_;
1448 1725
1449 $self->ns->ext_event ($type, %msg); 1726 $self->ns->ext_msg ($type, @msg);
1450} 1727}
1451 1728
1452=head3 cf::region 1729=head3 cf::region
1453 1730
1454=over 4 1731=over 4
1467 my ($path) = @_; 1744 my ($path) = @_;
1468 1745
1469 my ($match, $specificity); 1746 my ($match, $specificity);
1470 1747
1471 for my $region (list) { 1748 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1749 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1750 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1751 if $region->specificity > $specificity;
1475 } 1752 }
1476 } 1753 }
1477 1754
1498our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1499our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1500 1777
1501sub generate_random_map { 1778sub generate_random_map {
1502 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1503 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1504 $self->_create_random_map ( 1784 $self->_create_random_map (
1505 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1506 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1507 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1597 $self->init; # pass $1 etc. 1877 $self->init; # pass $1 etc.
1598 return $self; 1878 return $self;
1599 } 1879 }
1600 } 1880 }
1601 1881
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1882 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1883 ()
1604} 1884}
1605 1885
1606sub init { 1886sub init {
1607 my ($self) = @_; 1887 my ($self) = @_;
1670 1950
1671sub load_header_from($) { 1951sub load_header_from($) {
1672 my ($self, $path) = @_; 1952 my ($self, $path) = @_;
1673 1953
1674 utf8::encode $path; 1954 utf8::encode $path;
1675 #aio_open $path, O_RDONLY, 0 1955 my $f = new_from_file cf::object::thawer $path
1676 # or return;
1677
1678 $self->_load_header ($path)
1679 or return; 1956 or return;
1957
1958 $self->_load_header ($f)
1959 or return;
1960
1961 local $MAP_LOADING{$self->{path}} = $self;
1962 $f->resolve_delayed_derefs;
1680 1963
1681 $self->{load_path} = $path; 1964 $self->{load_path} = $path;
1682 1965
1683 1 1966 1
1684} 1967}
1738sub find { 2021sub find {
1739 my ($path, $origin) = @_; 2022 my ($path, $origin) = @_;
1740 2023
1741 $path = normalise $path, $origin && $origin->path; 2024 $path = normalise $path, $origin && $origin->path;
1742 2025
2026 cf::lock_wait "map_data:$path";#d#remove
1743 cf::lock_wait "map_find:$path"; 2027 cf::lock_wait "map_find:$path";
1744 2028
1745 $cf::MAP{$path} || do { 2029 $cf::MAP{$path} || do {
1746 my $guard = cf::lock_acquire "map_find:$path"; 2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
1747 my $map = new_from_path cf::map $path 2033 my $map = new_from_path cf::map $path
1748 or return; 2034 or return;
1749 2035
1750 $map->{last_save} = $cf::RUNTIME; 2036 $map->{last_save} = $cf::RUNTIME;
1751 2037
1753 or return; 2039 or return;
1754 2040
1755 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756 # doing this can freeze the server in a sync job, obviously 2042 # doing this can freeze the server in a sync job, obviously
1757 #$cf::WAIT_FOR_TICK->wait; 2043 #$cf::WAIT_FOR_TICK->wait;
2044 undef $guard1;
2045 undef $guard2;
1758 $map->reset; 2046 $map->reset;
1759 undef $guard;
1760 return find $path; 2047 return find $path;
1761 } 2048 }
1762 2049
1763 $cf::MAP{$path} = $map 2050 $cf::MAP{$path} = $map
1764 } 2051 }
1773 local $self->{deny_reset} = 1; # loading can take a long time 2060 local $self->{deny_reset} = 1; # loading can take a long time
1774 2061
1775 my $path = $self->{path}; 2062 my $path = $self->{path};
1776 2063
1777 { 2064 {
1778 my $guard = cf::lock_acquire "map_load:$path"; 2065 my $guard = cf::lock_acquire "map_data:$path";
1779 2066
2067 return unless $self->valid;
1780 return if $self->in_memory != cf::MAP_SWAPPED; 2068 return unless $self->in_memory == cf::MAP_SWAPPED;
1781 2069
1782 $self->in_memory (cf::MAP_LOADING); 2070 $self->in_memory (cf::MAP_LOADING);
1783 2071
1784 $self->alloc; 2072 $self->alloc;
1785 2073
1786 $self->pre_load; 2074 $self->pre_load;
1787 Coro::cede; 2075 cf::cede_to_tick;
1788 2076
2077 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block;
1789 $self->_load_objects ($self->{load_path}, 1) 2079 $self->_load_objects ($f)
1790 or return; 2080 or return;
1791 2081
1792 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1793 if delete $self->{load_original}; 2083 if delete $self->{load_original};
1794 2084
1795 if (my $uniq = $self->uniq_path) { 2085 if (my $uniq = $self->uniq_path) {
1796 utf8::encode $uniq; 2086 utf8::encode $uniq;
1797 if (aio_open $uniq, O_RDONLY, 0) { 2087 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) {
1798 $self->clear_unique_items; 2089 $self->clear_unique_items;
1799 $self->_load_objects ($uniq, 0); 2090 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs;
2092 }
1800 } 2093 }
1801 } 2094 }
1802 2095
1803 Coro::cede; 2096 $f->resolve_delayed_derefs;
2097
2098 cf::cede_to_tick;
1804 # now do the right thing for maps 2099 # now do the right thing for maps
1805 $self->link_multipart_objects; 2100 $self->link_multipart_objects;
1806 $self->difficulty ($self->estimate_difficulty) 2101 $self->difficulty ($self->estimate_difficulty)
1807 unless $self->difficulty; 2102 unless $self->difficulty;
1808 Coro::cede; 2103 cf::cede_to_tick;
1809 2104
1810 unless ($self->{deny_activate}) { 2105 unless ($self->{deny_activate}) {
1811 $self->decay_objects; 2106 $self->decay_objects;
1812 $self->fix_auto_apply; 2107 $self->fix_auto_apply;
1813 $self->update_buttons; 2108 $self->update_buttons;
1814 Coro::cede; 2109 cf::cede_to_tick;
1815 $self->set_darkness_map; 2110 $self->set_darkness_map;
1816 Coro::cede; 2111 cf::cede_to_tick;
1817 $self->activate; 2112 $self->activate;
1818 } 2113 }
2114
2115 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME);
1819 2117
1820 $self->in_memory (cf::MAP_IN_MEMORY); 2118 $self->in_memory (cf::MAP_IN_MEMORY);
1821 } 2119 }
1822 2120
1823 $self->post_load; 2121 $self->post_load;
1834 2132
1835 $self 2133 $self
1836} 2134}
1837 2135
1838# find and load all maps in the 3x3 area around a map 2136# find and load all maps in the 3x3 area around a map
1839sub load_diag { 2137sub load_neighbours {
1840 my ($map) = @_; 2138 my ($map) = @_;
1841 2139
1842 my @diag; # diagonal neighbours 2140 my @neigh; # diagonal neighbours
1843 2141
1844 for (0 .. 3) { 2142 for (0 .. 3) {
1845 my $neigh = $map->tile_path ($_) 2143 my $neigh = $map->tile_path ($_)
1846 or next; 2144 or next;
1847 $neigh = find $neigh, $map 2145 $neigh = find $neigh, $map
1848 or next; 2146 or next;
1849 $neigh->load; 2147 $neigh->load;
1850 2148
2149 push @neigh,
1851 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2150 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1852 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2151 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1853 } 2152 }
1854 2153
1855 for (@diag) { 2154 for (grep defined $_->[0], @neigh) {
2155 my ($path, $origin) = @$_;
1856 my $neigh = find @$_ 2156 my $neigh = find $path, $origin
1857 or next; 2157 or next;
1858 $neigh->load; 2158 $neigh->load;
1859 } 2159 }
1860} 2160}
1861 2161
1866} 2166}
1867 2167
1868sub do_load_sync { 2168sub do_load_sync {
1869 my ($map) = @_; 2169 my ($map) = @_;
1870 2170
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main;
2173
1871 cf::sync_job { $map->load }; 2174 cf::sync_job { $map->load };
1872} 2175}
1873 2176
1874our %MAP_PREFETCH; 2177our %MAP_PREFETCH;
1875our $MAP_PREFETCHER = undef; 2178our $MAP_PREFETCHER = undef;
1876 2179
1877sub find_async { 2180sub find_async {
1878 my ($path, $origin) = @_; 2181 my ($path, $origin, $load) = @_;
1879 2182
1880 $path = normalise $path, $origin && $origin->{path}; 2183 $path = normalise $path, $origin && $origin->{path};
1881 2184
1882 if (my $map = $cf::MAP{$path}) { 2185 if (my $map = $cf::MAP{$path}) {
1883 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1884 } 2187 }
1885 2188
1886 undef $MAP_PREFETCH{$path}; 2189 $MAP_PREFETCH{$path} |= $load;
2190
1887 $MAP_PREFETCHER ||= cf::async { 2191 $MAP_PREFETCHER ||= cf::async {
2192 $Coro::current->{desc} = "map prefetcher";
2193
1888 while (%MAP_PREFETCH) { 2194 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 2195 while (my ($k, $v) = each %MAP_PREFETCH) {
1890 my $map = find $path 2196 if (my $map = find $k) {
1891 or next;
1892 $map->load; 2197 $map->load if $v;
2198 }
1893 2199
1894 delete $MAP_PREFETCH{$path}; 2200 delete $MAP_PREFETCH{$k};
1895 } 2201 }
1896 } 2202 }
1897 undef $MAP_PREFETCHER; 2203 undef $MAP_PREFETCHER;
1898 }; 2204 };
1899 $MAP_PREFETCHER->prio (6); 2205 $MAP_PREFETCHER->prio (6);
1902} 2208}
1903 2209
1904sub save { 2210sub save {
1905 my ($self) = @_; 2211 my ($self) = @_;
1906 2212
1907 my $lock = cf::lock_acquire "map_data:" . $self->path; 2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
1908 2214
1909 $self->{last_save} = $cf::RUNTIME; 2215 $self->{last_save} = $cf::RUNTIME;
1910 2216
1911 return unless $self->dirty; 2217 return unless $self->dirty;
1912 2218
1918 return if $self->{deny_save}; 2224 return if $self->{deny_save};
1919 2225
1920 local $self->{last_access} = $self->last_access;#d# 2226 local $self->{last_access} = $self->last_access;#d#
1921 2227
1922 cf::async { 2228 cf::async {
2229 $Coro::current->{desc} = "map player save";
1923 $_->contr->save for $self->players; 2230 $_->contr->save for $self->players;
1924 }; 2231 };
1925 2232
1926 if ($uniq) { 2233 if ($uniq) {
1927 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1935 my ($self) = @_; 2242 my ($self) = @_;
1936 2243
1937 # save first because save cedes 2244 # save first because save cedes
1938 $self->save; 2245 $self->save;
1939 2246
1940 my $lock = cf::lock_acquire "map_data:" . $self->path; 2247 my $lock = cf::lock_acquire "map_data:$self->{path}";
1941 2248
1942 return if $self->players; 2249 return if $self->players;
1943 return if $self->in_memory != cf::MAP_IN_MEMORY; 2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
1944 return if $self->{deny_save}; 2251 return if $self->{deny_save};
1945 2252
2253 $self->in_memory (cf::MAP_SWAPPED);
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
1946 $self->clear; 2257 $self->clear;
1947 $self->in_memory (cf::MAP_SWAPPED);
1948} 2258}
1949 2259
1950sub reset_at { 2260sub reset_at {
1951 my ($self) = @_; 2261 my ($self) = @_;
1952 2262
1984 if $uniq; 2294 if $uniq;
1985 } 2295 }
1986 2296
1987 delete $cf::MAP{$self->path}; 2297 delete $cf::MAP{$self->path};
1988 2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
1989 $self->clear; 2301 $self->clear;
1990
1991 $_->clear_links_to ($self) for values %cf::MAP;
1992 2302
1993 $self->unlink_save; 2303 $self->unlink_save;
1994 $self->destroy; 2304 $self->destroy;
1995} 2305}
1996 2306
1997my $nuke_counter = "aaaa"; 2307my $nuke_counter = "aaaa";
1998 2308
1999sub nuke { 2309sub nuke {
2000 my ($self) = @_; 2310 my ($self) = @_;
2001 2311
2312 {
2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314
2002 delete $cf::MAP{$self->path}; 2315 delete $cf::MAP{$self->path};
2003 2316
2004 $self->unlink_save; 2317 $self->unlink_save;
2005 2318
2006 bless $self, "cf::map"; 2319 bless $self, "cf::map";
2007 delete $self->{deny_reset}; 2320 delete $self->{deny_reset};
2008 $self->{deny_save} = 1; 2321 $self->{deny_save} = 1;
2009 $self->reset_timeout (1); 2322 $self->reset_timeout (1);
2010 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011 2324
2012 $cf::MAP{$self->path} = $self; 2325 $cf::MAP{$self->path} = $self;
2326 }
2013 2327
2014 $self->reset; # polite request, might not happen 2328 $self->reset; # polite request, might not happen
2015} 2329}
2016 2330
2017=item $maps = cf::map::tmp_maps 2331=item $maps = cf::map::tmp_maps
2066 : () 2380 : ()
2067 } @{ aio_readdir $UNIQUEDIR or [] } 2381 } @{ aio_readdir $UNIQUEDIR or [] }
2068 ] 2382 ]
2069} 2383}
2070 2384
2071package cf;
2072
2073=back 2385=back
2074 2386
2075=head3 cf::object 2387=head3 cf::object
2076 2388
2077=cut 2389=cut
2091 map { $_, inv_recursive_ $_->inv } @_ 2403 map { $_, inv_recursive_ $_->inv } @_
2092} 2404}
2093 2405
2094sub inv_recursive { 2406sub inv_recursive {
2095 inv_recursive_ inv $_[0] 2407 inv_recursive_ inv $_[0]
2408}
2409
2410=item $ref = $ob->ref
2411
2412creates and returns a persistent reference to an objetc that can be stored as a string.
2413
2414=item $ob = cf::object::deref ($refstring)
2415
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block.
2418
2419=cut
2420
2421sub deref {
2422 my ($ref) = @_;
2423
2424 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2425 my ($uuid, $name) = ($1, $2);
2426 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2427 or return;
2428 $pl->ob->uuid eq $uuid
2429 or return;
2430
2431 $pl->ob
2432 } else {
2433 warn "$ref: cannot resolve object reference\n";
2434 undef
2435 }
2096} 2436}
2097 2437
2098package cf; 2438package cf;
2099 2439
2100=back 2440=back
2124 2464
2125 } else { 2465 } else {
2126 my $pl = $self->contr; 2466 my $pl = $self->contr;
2127 2467
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2468 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2469 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2471
2137 } else { 2472 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2473 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2474 $self->message ($msg, $flags);
2140 } 2475 }
2141 } 2476 }
2477}
2478
2479=item $object->send_msg ($channel, $msg, $color, [extra...])
2480
2481=cut
2482
2483sub cf::object::send_msg {
2484 my $pl = shift->contr
2485 or return;
2486 $pl->send_msg (@_);
2142} 2487}
2143 2488
2144=item $player_object->may ("access") 2489=item $player_object->may ("access")
2145 2490
2146Returns wether the given player is authorized to access resource "access" 2491Returns wether the given player is authorized to access resource "access"
2225 # use -1 or undef as default coordinates, not 0, 0 2570 # use -1 or undef as default coordinates, not 0, 0
2226 ($x, $y) = ($map->enter_x, $map->enter_y) 2571 ($x, $y) = ($map->enter_x, $map->enter_y)
2227 if $x <=0 && $y <= 0; 2572 if $x <=0 && $y <= 0;
2228 2573
2229 $map->load; 2574 $map->load;
2230 $map->load_diag; 2575 $map->load_neighbours;
2231 2576
2232 return unless $self->contr->active; 2577 return unless $self->contr->active;
2233 $self->activate_recursive; 2578 $self->activate_recursive;
2234 2579
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2581 $self->enter_map ($map, $x, $y);
2237} 2582}
2238 2583
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2585
2241Moves the player to the given map-path and coordinates by first freezing 2586Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2587her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2588that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2589the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process.
2245 2591
2246=cut 2592=cut
2247 2593
2248our $GOTOGEN; 2594our $GOTOGEN;
2249 2595
2250sub cf::object::player::goto { 2596sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2597 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2598
2253 # do generation counting so two concurrent goto's will be executed in-order 2599 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2600 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2601
2256 $self->enter_link; 2602 $self->enter_link;
2257 2603
2258 (async { 2604 (async {
2605 $Coro::current->{desc} = "player::goto $path $x $y";
2606
2607 # *tag paths override both path and x|y
2608 if ($path =~ /^\*(.*)$/) {
2609 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2610 my $ob = $obs[rand @obs];
2611
2612 # see if we actually can go there
2613 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2614 $ob = $obs[rand @obs];
2615 } else {
2616 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2617 }
2618 # else put us there anyways for now #d#
2619
2620 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2621 } else {
2622 ($path, $x, $y) = (undef, undef, undef);
2623 }
2624 }
2625
2259 my $map = eval { 2626 my $map = eval {
2260 my $map = cf::map::find $path; 2627 my $map = defined $path ? cf::map::find $path : undef;
2261 2628
2262 if ($map) { 2629 if ($map) {
2263 $map = $map->customise_for ($self); 2630 $map = $map->customise_for ($self);
2264 $map = $check->($map) if $check && $map; 2631 $map = $check->($map) if $check && $map;
2265 } else { 2632 } else {
2266 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2633 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2267 } 2634 }
2268 2635
2269 $map 2636 $map
2270 }; 2637 };
2271 2638
2276 2643
2277 if ($gen == $self->{_goto_generation}) { 2644 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2645 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2646 $self->leave_link ($map, $x, $y);
2280 } 2647 }
2648
2649 $done->() if $done;
2281 })->prio (1); 2650 })->prio (1);
2282} 2651}
2283 2652
2284=item $player_object->enter_exit ($exit_object) 2653=item $player_object->enter_exit ($exit_object)
2285 2654
2322 $rmp->{origin_y} = $exit->y; 2691 $rmp->{origin_y} = $exit->y;
2323 } 2692 }
2324 2693
2325 $rmp->{random_seed} ||= $exit->random_seed; 2694 $rmp->{random_seed} ||= $exit->random_seed;
2326 2695
2327 my $data = cf::to_json $rmp; 2696 my $data = cf::encode_json $rmp;
2328 my $md5 = Digest::MD5::md5_hex $data; 2697 my $md5 = Digest::MD5::md5_hex $data;
2329 my $meta = "$RANDOMDIR/$md5.meta"; 2698 my $meta = "$RANDOMDIR/$md5.meta";
2330 2699
2331 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2332 aio_write $fh, 0, (length $data), $data, 0; 2701 aio_write $fh, 0, (length $data), $data, 0;
2354 my $hp = $exit->stats->hp; 2723 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2724 my $sp = $exit->stats->sp;
2356 2725
2357 $self->enter_link; 2726 $self->enter_link;
2358 2727
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2359 (async { 2732 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2734
2360 $self->deactivate_recursive; # just to be sure 2735 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2736 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2737 $self->goto ($slaying, $hp, $sp);
2363 2738
2364 1; 2739 1;
2390 2765
2391 utf8::encode $text; 2766 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2768}
2394 2769
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2770=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2771
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2772Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of 2773client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress 2774the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2775the message unless the client supports the msg packet.
2401 2776
2402=cut 2777=cut
2403 2778
2779# non-persistent channels (usually the info channel)
2780our %CHANNEL = (
2781 "c/identify" => {
2782 id => "infobox",
2783 title => "Identify",
2784 reply => undef,
2785 tooltip => "Items recently identified",
2786 },
2787 "c/examine" => {
2788 id => "infobox",
2789 title => "Examine",
2790 reply => undef,
2791 tooltip => "Signs and other items you examined",
2792 },
2793 "c/book" => {
2794 id => "infobox",
2795 title => "Book",
2796 reply => undef,
2797 tooltip => "The contents of a note or book",
2798 },
2799 "c/lookat" => {
2800 id => "infobox",
2801 title => "Look",
2802 reply => undef,
2803 tooltip => "What you saw there",
2804 },
2805 "c/who" => {
2806 id => "infobox",
2807 title => "Players",
2808 reply => undef,
2809 tooltip => "Shows players who are currently online",
2810 },
2811 "c/body" => {
2812 id => "infobox",
2813 title => "Body Parts",
2814 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available",
2816 },
2817 "c/uptime" => {
2818 id => "infobox",
2819 title => "Uptime",
2820 reply => undef,
2821 tooltip => "How long the server has been running since last restart",
2822 },
2823 "c/mapinfo" => {
2824 id => "infobox",
2825 title => "Map Info",
2826 reply => undef,
2827 tooltip => "Information related to the maps",
2828 },
2829);
2830
2404sub cf::client::send_msg { 2831sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2832 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2833
2407 $msg = $self->pl->expand_cfpod ($msg); 2834 $msg = $self->pl->expand_cfpod ($msg);
2408 2835
2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837
2838 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel};
2841
2842 $self->ext_msg (channel_info => $channel)
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id};
2846
2847 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel)
2852 if $self->can_msg;
2853 }
2854
2855 $channel = $channel->{id};
2856 }
2857
2858 return unless @extra || length $msg;
2859
2409 if ($self->can_msg) { 2860 if ($self->can_msg) {
2861 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF;
2864
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2865 $self->send_packet ("msg " . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411 } else { 2867 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 if ($color >= 0) { 2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878
2879 $color &= cf::NDI_COLOR_MASK;
2880
2881 utf8::encode $msg;
2882
2423 if (0 && $msg =~ /\[/) { 2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2886 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2888 $self->send_packet ("drawinfo $color $msg")
2428 } 2889 }
2429 } 2890 }
2430 } 2891 }
2431} 2892}
2432 2893
2433=item $client->ext_event ($type, %msg) 2894=item $client->ext_msg ($type, @msg)
2434 2895
2435Sends an ext event to the client. 2896Sends an ext event to the client.
2436 2897
2437=cut 2898=cut
2438 2899
2439sub cf::client::ext_event($$%) { 2900sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2901 my ($self, $type, @msg) = @_;
2441 2902
2903 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2906 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 }
2909}
2910
2911=item $client->ext_reply ($msgid, @msg)
2912
2913Sends an ext reply to the client.
2914
2915=cut
2916
2917sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_;
2919
2920 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 }
2444} 2927}
2445 2928
2446=item $success = $client->query ($flags, "text", \&cb) 2929=item $success = $client->query ($flags, "text", \&cb)
2447 2930
2448Queues a query to the client, calling the given callback with 2931Queues a query to the client, calling the given callback with
2503 my ($ns, $buf) = @_; 2986 my ($ns, $buf) = @_;
2504 2987
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2988 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2989
2507 if (ref $msg) { 2990 if (ref $msg) {
2991 my ($type, $reply, @payload) =
2992 "ARRAY" eq ref $msg
2993 ? @$msg
2994 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2995
2996 my @reply;
2997
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2998 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2999 @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 } 3000 }
3001
3002 $ns->ext_reply ($reply, @reply)
3003 if $reply;
3004
2514 } else { 3005 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3006 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 3007 }
2517 3008
2518 cf::override; 3009 cf::override;
2565our $safe = new Safe "safe"; 3056our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 3057our $safe_hole = new Safe::Hole;
2567 3058
2568$SIG{FPE} = 'IGNORE'; 3059$SIG{FPE} = 'IGNORE';
2569 3060
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3061$safe->permit_only (Opcode::opset qw(
3062 :base_core :base_mem :base_orig :base_math
3063 grepstart grepwhile mapstart mapwhile
3064 sort time
3065));
2571 3066
2572# here we export the classes and methods available to script code 3067# here we export the classes and methods available to script code
2573 3068
2574=pod 3069=pod
2575 3070
2576The following functions and methods are available within a safe environment: 3071The following functions and methods are available within a safe environment:
2577 3072
2578 cf::object contr pay_amount pay_player map 3073 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr
3076
2579 cf::object::player player 3077 cf::object::player
2580 cf::player peaceful 3078 player
2581 cf::map trigger 3079
3080 cf::player
3081 peaceful
3082
3083 cf::map
3084 trigger
2582 3085
2583=cut 3086=cut
2584 3087
2585for ( 3088for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race
3091 decrease_ob_nr destroy)],
2587 ["cf::object::player" => qw(player)], 3092 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 3093 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 3094 ["cf::map" => qw(trigger)],
2590) { 3095) {
2591 no strict 'refs'; 3096 no strict 'refs';
2667# the server's init and main functions 3172# the server's init and main functions
2668 3173
2669sub load_facedata($) { 3174sub load_facedata($) {
2670 my ($path) = @_; 3175 my ($path) = @_;
2671 3176
3177 # HACK to clear player env face cache, we need some signal framework
3178 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = ();
3180
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182
2672 warn "loading facedata from $path\n"; 3183 warn "loading facedata from $path\n";
2673 3184
2674 my $facedata; 3185 my $facedata;
2675 0 < aio_load $path, $facedata 3186 0 < aio_load $path, $facedata
2676 or die "$path: $!"; 3187 or die "$path: $!";
2678 $facedata = Coro::Storable::thaw $facedata; 3189 $facedata = Coro::Storable::thaw $facedata;
2679 3190
2680 $facedata->{version} == 2 3191 $facedata->{version} == 2
2681 or cf::cleanup "$path: version mismatch, cannot proceed."; 3192 or cf::cleanup "$path: version mismatch, cannot proceed.";
2682 3193
3194 # patch in the exptable
3195 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3198 };
3199 cf::cede_to_tick;
3200
2683 { 3201 {
2684 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
2685 3203
2686 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3207 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691 Coro::cede; 3211
3212 cf::cede_to_tick;
2692 } 3213 }
2693 3214
2694 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
2696 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
2697 or next; 3219 or next;
3220
2698 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 3224 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 3226 }
2703 Coro::cede; 3227
3228 cf::cede_to_tick;
2704 } 3229 }
2705 } 3230 }
2706 3231
2707 { 3232 {
2708 my $anims = $facedata->{animinfo}; 3233 my $anims = $facedata->{animinfo};
2709 3234
2710 while (my ($anim, $info) = each %$anims) { 3235 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3236 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 3237 cf::cede_to_tick;
2713 } 3238 }
2714 3239
2715 cf::anim::invalidate_all; # d'oh 3240 cf::anim::invalidate_all; # d'oh
2716 } 3241 }
2717 3242
3243 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource};
3247
3248 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252
3253 if ($info->{type} & 1) {
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
3268 } else {
3269 $RESOURCE{$name} = $info;
3270 }
3271
3272 cf::cede_to_tick;
3273 }
3274 }
3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277
2718 1 3278 1
2719} 3279}
2720 3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300
3301register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_;
3303
3304 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v);
3306 }
3307};
3308
2721sub reload_regions { 3309sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = ();
3313
2722 load_resource_file "$MAPDIR/regions" 3314 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 3315 or die "unable to load regions file\n";
3316
3317 for (cf::region::list) {
3318 $_->{match} = qr/$_->{match}/
3319 if exists $_->{match};
3320 }
2724} 3321}
2725 3322
2726sub reload_facedata { 3323sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 3324 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 3325 or die "unable to load facedata\n";
2757 3354
2758sub init { 3355sub init {
2759 reload_resources; 3356 reload_resources;
2760} 3357}
2761 3358
2762sub cfg_load { 3359sub reload_config {
2763 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
2764 or return; 3361 or return;
2765 3362
2766 local $/; 3363 local $/;
2767 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
2768 3365
2769 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2770 3367
2771 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2772 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2783sub main { 3380sub main {
2784 # we must not ever block the main coroutine 3381 # we must not ever block the main coroutine
2785 local $Coro::idle = sub { 3382 local $Coro::idle = sub {
2786 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787 (async { 3384 (async {
2788 Event::one_event; 3385 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT;
2789 })->prio (Coro::PRIO_MAX); 3387 })->prio (Coro::PRIO_MAX);
2790 }; 3388 };
2791 3389
2792 cfg_load; 3390 reload_config;
2793 db_init; 3391 db_init;
2794 load_extensions; 3392 load_extensions;
2795 3393
2796 $TICK_WATCHER->start; 3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno;
2797 Event::loop; 3396 EV::loop;
2798} 3397}
2799 3398
2800############################################################################# 3399#############################################################################
2801# initialisation and cleanup 3400# initialisation and cleanup
2802 3401
2803# install some emergency cleanup handlers 3402# install some emergency cleanup handlers
2804BEGIN { 3403BEGIN {
3404 our %SIGWATCHER = ();
2805 for my $signal (qw(INT HUP TERM)) { 3405 for my $signal (qw(INT HUP TERM)) {
2806 Event->signal ( 3406 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2807 reentrant => 0,
2808 data => WF_AUTOCANCEL,
2809 signal => $signal,
2810 prio => 0,
2811 cb => sub {
2812 cf::cleanup "SIG$signal"; 3407 cf::cleanup "SIG$signal";
2813 },
2814 ); 3408 };
2815 } 3409 }
2816} 3410}
2817 3411
2818sub write_runtime { 3412sub write_runtime_sync {
2819 my $runtime = "$LOCALDIR/runtime"; 3413 my $runtime = "$LOCALDIR/runtime";
2820 3414
2821 # first touch the runtime file to show we are still running: 3415 # first touch the runtime file to show we are still running:
2822 # the fsync below can take a very very long time. 3416 # the fsync below can take a very very long time.
2823 3417
2849 and return; 3443 and return;
2850 3444
2851 warn "runtime file written.\n"; 3445 warn "runtime file written.\n";
2852 3446
2853 1 3447 1
3448}
3449
3450our $uuid_lock;
3451our $uuid_skip;
3452
3453sub write_uuid_sync($) {
3454 $uuid_skip ||= $_[0];
3455
3456 return if $uuid_lock;
3457 local $uuid_lock = 1;
3458
3459 my $uuid = "$LOCALDIR/uuid";
3460
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return;
3463
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3465 $uuid_skip = 0;
3466
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return;
3469
3470 # always fsync - this file is important
3471 aio_fsync $fh
3472 and return;
3473
3474 close $fh
3475 or return;
3476
3477 aio_rename "$uuid~", $uuid
3478 and return;
3479
3480 warn "uuid file written ($value).\n";
3481
3482 1
3483
3484}
3485
3486sub write_uuid($$) {
3487 my ($skip, $sync) = @_;
3488
3489 $sync ? write_uuid_sync $skip
3490 : async { write_uuid_sync $skip };
2854} 3491}
2855 3492
2856sub emergency_save() { 3493sub emergency_save() {
2857 my $freeze_guard = cf::freeze_mainloop; 3494 my $freeze_guard = cf::freeze_mainloop;
2858 3495
2864 # and maps saved/destroyed asynchronously. 3501 # and maps saved/destroyed asynchronously.
2865 warn "begin emergency player save\n"; 3502 warn "begin emergency player save\n";
2866 for my $login (keys %cf::PLAYER) { 3503 for my $login (keys %cf::PLAYER) {
2867 my $pl = $cf::PLAYER{$login} or next; 3504 my $pl = $cf::PLAYER{$login} or next;
2868 $pl->valid or next; 3505 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2869 $pl->save; 3507 $pl->save;
2870 } 3508 }
2871 warn "end emergency player save\n"; 3509 warn "end emergency player save\n";
2872 3510
2873 warn "begin emergency map save\n"; 3511 warn "begin emergency map save\n";
2879 warn "end emergency map save\n"; 3517 warn "end emergency map save\n";
2880 3518
2881 warn "begin emergency database checkpoint\n"; 3519 warn "begin emergency database checkpoint\n";
2882 BDB::db_env_txn_checkpoint $DB_ENV; 3520 BDB::db_env_txn_checkpoint $DB_ENV;
2883 warn "end emergency database checkpoint\n"; 3521 warn "end emergency database checkpoint\n";
3522
3523 warn "begin write uuid\n";
3524 write_uuid_sync 1;
3525 warn "end write uuid\n";
2884 }; 3526 };
2885 3527
2886 warn "leave emergency perl save\n"; 3528 warn "leave emergency perl save\n";
2887} 3529}
2888 3530
2903 warn "reloading..."; 3545 warn "reloading...";
2904 3546
2905 warn "entering sync_job"; 3547 warn "entering sync_job";
2906 3548
2907 cf::sync_job { 3549 cf::sync_job {
2908 cf::write_runtime; # external watchdog should not bark 3550 cf::write_runtime_sync; # external watchdog should not bark
2909 cf::emergency_save; 3551 cf::emergency_save;
2910 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
2911 3553
2912 warn "syncing database to disk"; 3554 warn "syncing database to disk";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3555 BDB::db_env_txn_checkpoint $DB_ENV;
2914 3556
2915 # if anything goes wrong in here, we should simply crash as we already saved 3557 # if anything goes wrong in here, we should simply crash as we already saved
2916
2917 warn "cancelling all WF_AUTOCANCEL watchers";
2918 for (Event::all_watchers) {
2919 $_->cancel if $_->data & WF_AUTOCANCEL;
2920 }
2921 3558
2922 warn "flushing outstanding aio requests"; 3559 warn "flushing outstanding aio requests";
2923 for (;;) { 3560 for (;;) {
2924 BDB::flush; 3561 BDB::flush;
2925 IO::AIO::flush; 3562 IO::AIO::flush;
2926 Coro::cede; 3563 Coro::cede_notself;
2927 last unless IO::AIO::nreqs || BDB::nreqs; 3564 last unless IO::AIO::nreqs || BDB::nreqs;
2928 warn "iterate..."; 3565 warn "iterate...";
2929 } 3566 }
2930 3567
2931 ++$RELOAD; 3568 ++$RELOAD;
2990 warn "reloading cf.pm"; 3627 warn "reloading cf.pm";
2991 require cf; 3628 require cf;
2992 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993 3630
2994 warn "loading config and database again"; 3631 warn "loading config and database again";
2995 cf::cfg_load; 3632 cf::reload_config;
2996 3633
2997 warn "loading extensions"; 3634 warn "loading extensions";
2998 cf::load_extensions; 3635 cf::load_extensions;
2999 3636
3000 warn "reattaching attachments to objects/players"; 3637 warn "reattaching attachments to objects/players";
3007 warn "leaving sync_job"; 3644 warn "leaving sync_job";
3008 3645
3009 1 3646 1
3010 } or do { 3647 } or do {
3011 warn $@; 3648 warn $@;
3012 warn "error while reloading, exiting."; 3649 cf::cleanup "error while reloading, exiting.";
3013 exit 1;
3014 }; 3650 };
3015 3651
3016 warn "reloaded"; 3652 warn "reloaded";
3017}; 3653};
3018 3654
3020 3656
3021sub reload_perl() { 3657sub reload_perl() {
3022 # doing reload synchronously and two reloads happen back-to-back, 3658 # doing reload synchronously and two reloads happen back-to-back,
3023 # coro crashes during coro_state_free->destroy here. 3659 # coro crashes during coro_state_free->destroy here.
3024 3660
3025 $RELOAD_WATCHER ||= Event->timer ( 3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3026 reentrant => 0,
3027 after => 0,
3028 data => WF_AUTOCANCEL,
3029 cb => sub {
3030 do_reload_perl; 3662 do_reload_perl;
3031 undef $RELOAD_WATCHER; 3663 undef $RELOAD_WATCHER;
3032 },
3033 ); 3664 };
3034} 3665}
3035 3666
3036register_command "reload" => sub { 3667register_command "reload" => sub {
3037 my ($who, $arg) = @_; 3668 my ($who, $arg) = @_;
3038 3669
3039 if ($who->flag (FLAG_WIZ)) { 3670 if ($who->flag (FLAG_WIZ)) {
3040 $who->message ("reloading server."); 3671 $who->message ("reloading server.");
3672 async {
3673 $Coro::current->{desc} = "perl_reload";
3041 async { reload_perl }; 3674 reload_perl;
3675 };
3042 } 3676 }
3043}; 3677};
3044 3678
3045unshift @INC, $LIBDIR; 3679unshift @INC, $LIBDIR;
3046 3680
3048 3682
3049our @WAIT_FOR_TICK; 3683our @WAIT_FOR_TICK;
3050our @WAIT_FOR_TICK_BEGIN; 3684our @WAIT_FOR_TICK_BEGIN;
3051 3685
3052sub wait_for_tick { 3686sub wait_for_tick {
3053 return unless $TICK_WATCHER->is_active; 3687 return if tick_inhibit;
3054 return if $Coro::current == $Coro::main; 3688 return if $Coro::current == $Coro::main;
3055 3689
3056 my $signal = new Coro::Signal; 3690 my $signal = new Coro::Signal;
3057 push @WAIT_FOR_TICK, $signal; 3691 push @WAIT_FOR_TICK, $signal;
3058 $signal->wait; 3692 $signal->wait;
3059} 3693}
3060 3694
3061sub wait_for_tick_begin { 3695sub wait_for_tick_begin {
3062 return unless $TICK_WATCHER->is_active; 3696 return if tick_inhibit;
3063 return if $Coro::current == $Coro::main; 3697 return if $Coro::current == $Coro::main;
3064 3698
3065 my $signal = new Coro::Signal; 3699 my $signal = new Coro::Signal;
3066 push @WAIT_FOR_TICK_BEGIN, $signal; 3700 push @WAIT_FOR_TICK_BEGIN, $signal;
3067 $signal->wait; 3701 $signal->wait;
3068} 3702}
3069 3703
3070 my $min = 1e6;#d# 3704sub tick {
3071 my $avg = 10;
3072$TICK_WATCHER = Event->timer (
3073 reentrant => 0,
3074 parked => 1,
3075 prio => 0,
3076 at => $NEXT_TICK || $TICK,
3077 data => WF_AUTOCANCEL,
3078 cb => sub {
3079 if ($Coro::current != $Coro::main) { 3705 if ($Coro::current != $Coro::main) {
3080 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3706 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3081 unless ++$bug_warning > 10; 3707 unless ++$bug_warning > 10;
3082 return; 3708 return;
3083 } 3709 }
3084 3710
3085 $NOW = $tick_start = Event::time;
3086
3087 cf::server_tick; # one server iteration 3711 cf::server_tick; # one server iteration
3088 3712
3089 0 && sync_job {#d# 3713 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3090 for(1..10) { 3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3091 my $t = Event::time; 3715 Coro::async_pool {
3092 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3716 $Coro::current->{desc} = "runtime saver";
3093 or die; 3717 write_runtime_sync
3094 3718 or warn "ERROR: unable to write runtime file: $!";
3095 $map->width (50);
3096 $map->height (50);
3097 $map->alloc;
3098 $map->_load_objects ("/tmp/x.map", 1);
3099 my $t = Event::time - $t;
3100
3101 #next unless $t < 0.0013;#d#
3102 if ($t < $min) {
3103 $min = $t;
3104 }
3105 $avg = $avg * 0.99 + $t * 0.01;
3106 }
3107 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108 exit 0;
3109 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110 }; 3719 };
3720 }
3111 3721
3112 $RUNTIME += $TICK;
3113 $NEXT_TICK += $TICK;
3114
3115 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116 $NEXT_RUNTIME_WRITE = $NOW + 10;
3117 Coro::async_pool {
3118 write_runtime
3119 or warn "ERROR: unable to write runtime file: $!";
3120 };
3121 }
3122
3123# my $AFTER = Event::time;
3124# warn $AFTER - $NOW;#d#
3125
3126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127 $sig->send; 3723 $sig->send;
3128 } 3724 }
3129 while (my $sig = shift @WAIT_FOR_TICK) { 3725 while (my $sig = shift @WAIT_FOR_TICK) {
3130 $sig->send; 3726 $sig->send;
3131 } 3727 }
3132 3728
3133 $NOW = Event::time; 3729 $LOAD = ($NOW - $TICK_START) / $TICK;
3134
3135 # if we are delayed by four ticks or more, skip them all
3136 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3137
3138 $TICK_WATCHER->at ($NEXT_TICK);
3139 $TICK_WATCHER->start;
3140
3141 $LOAD = ($NOW - $tick_start) / $TICK;
3142 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3730 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143 3731
3144 _post_tick; 3732 if (0) {
3145 3733 if ($NEXT_TICK) {
3146 3734 my $jitter = $TICK_START - $NEXT_TICK;
3735 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3736 warn "jitter $JITTER\n";#d#
3737 }
3147 }, 3738 }
3148); 3739}
3149 3740
3150{ 3741{
3151 BDB::max_poll_time $TICK * 0.1; 3742 # configure BDB
3152 $BDB_POLL_WATCHER = Event->io ( 3743
3153 reentrant => 0,
3154 fd => BDB::poll_fileno,
3155 poll => 'r',
3156 prio => 0,
3157 data => WF_AUTOCANCEL,
3158 cb => \&BDB::poll_cb,
3159 );
3160 BDB::min_parallel 8; 3744 BDB::min_parallel 8;
3161 3745 BDB::max_poll_reqs $TICK * 0.1;
3162 BDB::set_sync_prepare { 3746 $Coro::BDB::WATCHER->priority (1);
3163 my $status;
3164 my $current = $Coro::current;
3165 (
3166 sub {
3167 $status = $!;
3168 $current->ready; undef $current;
3169 },
3170 sub {
3171 Coro::schedule while defined $current;
3172 $! = $status;
3173 },
3174 )
3175 };
3176 3747
3177 unless ($DB_ENV) { 3748 unless ($DB_ENV) {
3178 $DB_ENV = BDB::db_env_create; 3749 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3751 | BDB::LOG_AUTOREMOVE, 1);
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179 3754
3180 cf::sync_job { 3755 cf::sync_job {
3181 eval { 3756 eval {
3182 BDB::db_env_open 3757 BDB::db_env_open
3183 $DB_ENV, 3758 $DB_ENV,
3185 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3760 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3186 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3761 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3187 0666; 3762 0666;
3188 3763
3189 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3764 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3192 $DB_ENV->set_lk_detect;
3193 }; 3765 };
3194 3766
3195 cf::cleanup "db_env_open(db): $@" if $@; 3767 cf::cleanup "db_env_open(db): $@" if $@;
3196 }; 3768 };
3197 } 3769 }
3770
3771 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3772 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3773 };
3774 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3775 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3776 };
3777 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3778 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3779 };
3198} 3780}
3199 3781
3200{ 3782{
3783 # configure IO::AIO
3784
3201 IO::AIO::min_parallel 8; 3785 IO::AIO::min_parallel 8;
3202
3203 undef $Coro::AIO::WATCHER;
3204 IO::AIO::max_poll_time $TICK * 0.1; 3786 IO::AIO::max_poll_time $TICK * 0.1;
3205 $AIO_POLL_WATCHER = Event->io ( 3787 $Coro::AIO::WATCHER->priority (1);
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 fd => IO::AIO::poll_fileno,
3209 poll => 'r',
3210 prio => 6,
3211 cb => \&IO::AIO::poll_cb,
3212 );
3213} 3788}
3214 3789
3215my $_log_backtrace; 3790my $_log_backtrace;
3216 3791
3217sub _log_backtrace { 3792sub _log_backtrace {
3221 3796
3222 # limit the # of concurrent backtraces 3797 # limit the # of concurrent backtraces
3223 if ($_log_backtrace < 2) { 3798 if ($_log_backtrace < 2) {
3224 ++$_log_backtrace; 3799 ++$_log_backtrace;
3225 async { 3800 async {
3801 $Coro::current->{desc} = "abt $msg";
3802
3226 my @bt = fork_call { 3803 my @bt = fork_call {
3227 @addr = map { sprintf "%x", $_ } @addr; 3804 @addr = map { sprintf "%x", $_ } @addr;
3228 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3805 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3806 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230 or die "addr2line: $!"; 3807 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines