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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.419 by root, Sun Apr 13 01:34:09 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 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1702 $_[0]{hintmode}
1426} 1703}
1427 1704
1428=item $player->ext_reply ($msgid, %msg) 1705=item $player->ext_reply ($msgid, @msg)
1429 1706
1430Sends an ext reply to the player. 1707Sends an ext reply to the player.
1431 1708
1432=cut 1709=cut
1433 1710
1434sub ext_reply($$%) { 1711sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1712 my ($self, $id, @msg) = @_;
1436 1713
1437 $msg{msgid} = $id; 1714 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1715}
1440 1716
1441=item $player->ext_event ($type, %msg) 1717=item $player->ext_msg ($type, @msg)
1442 1718
1443Sends an ext event to the client. 1719Sends an ext event to the client.
1444 1720
1445=cut 1721=cut
1446 1722
1447sub ext_event($$%) { 1723sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1724 my ($self, $type, @msg) = @_;
1449 1725
1450 $self->ns->ext_event ($type, %msg); 1726 $self->ns->ext_msg ($type, @msg);
1451} 1727}
1452 1728
1453=head3 cf::region 1729=head3 cf::region
1454 1730
1455=over 4 1731=over 4
1468 my ($path) = @_; 1744 my ($path) = @_;
1469 1745
1470 my ($match, $specificity); 1746 my ($match, $specificity);
1471 1747
1472 for my $region (list) { 1748 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1749 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1750 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1751 if $region->specificity > $specificity;
1476 } 1752 }
1477 } 1753 }
1478 1754
1499our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1500our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1501 1777
1502sub generate_random_map { 1778sub generate_random_map {
1503 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
1504 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1505 $self->_create_random_map ( 1784 $self->_create_random_map (
1506 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1507 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1508 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1598 $self->init; # pass $1 etc. 1877 $self->init; # pass $1 etc.
1599 return $self; 1878 return $self;
1600 } 1879 }
1601 } 1880 }
1602 1881
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1882 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1883 ()
1605} 1884}
1606 1885
1607sub init { 1886sub init {
1608 my ($self) = @_; 1887 my ($self) = @_;
1630 1909
1631# the temporary/swap location 1910# the temporary/swap location
1632sub save_path { 1911sub save_path {
1633 my ($self) = @_; 1912 my ($self) = @_;
1634 1913
1635 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1636 "$TMPDIR/$path.map" 1915 "$TMPDIR/$path.map"
1637} 1916}
1638 1917
1639# the unique path, undef == no special unique path 1918# the unique path, undef == no special unique path
1640sub uniq_path { 1919sub uniq_path {
1641 my ($self) = @_; 1920 my ($self) = @_;
1642 1921
1643 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1644 "$UNIQUEDIR/$path" 1923 "$UNIQUEDIR/$path"
1645} 1924}
1646 1925
1647# and all this just because we cannot iterate over 1926# and all this just because we cannot iterate over
1648# all maps in C++... 1927# all maps in C++...
1671 1950
1672sub load_header_from($) { 1951sub load_header_from($) {
1673 my ($self, $path) = @_; 1952 my ($self, $path) = @_;
1674 1953
1675 utf8::encode $path; 1954 utf8::encode $path;
1676 #aio_open $path, O_RDONLY, 0 1955 my $f = new_from_file cf::object::thawer $path
1677 # or return;
1678
1679 $self->_load_header ($path)
1680 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;
1681 1963
1682 $self->{load_path} = $path; 1964 $self->{load_path} = $path;
1683 1965
1684 1 1966 1
1685} 1967}
1739sub find { 2021sub find {
1740 my ($path, $origin) = @_; 2022 my ($path, $origin) = @_;
1741 2023
1742 $path = normalise $path, $origin && $origin->path; 2024 $path = normalise $path, $origin && $origin->path;
1743 2025
2026 cf::lock_wait "map_data:$path";#d#remove
1744 cf::lock_wait "map_find:$path"; 2027 cf::lock_wait "map_find:$path";
1745 2028
1746 $cf::MAP{$path} || do { 2029 $cf::MAP{$path} || do {
1747 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
1748 my $map = new_from_path cf::map $path 2033 my $map = new_from_path cf::map $path
1749 or return; 2034 or return;
1750 2035
1751 $map->{last_save} = $cf::RUNTIME; 2036 $map->{last_save} = $cf::RUNTIME;
1752 2037
1754 or return; 2039 or return;
1755 2040
1756 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757 # doing this can freeze the server in a sync job, obviously 2042 # doing this can freeze the server in a sync job, obviously
1758 #$cf::WAIT_FOR_TICK->wait; 2043 #$cf::WAIT_FOR_TICK->wait;
2044 undef $guard1;
2045 undef $guard2;
1759 $map->reset; 2046 $map->reset;
1760 undef $guard;
1761 return find $path; 2047 return find $path;
1762 } 2048 }
1763 2049
1764 $cf::MAP{$path} = $map 2050 $cf::MAP{$path} = $map
1765 } 2051 }
1774 local $self->{deny_reset} = 1; # loading can take a long time 2060 local $self->{deny_reset} = 1; # loading can take a long time
1775 2061
1776 my $path = $self->{path}; 2062 my $path = $self->{path};
1777 2063
1778 { 2064 {
1779 my $guard = cf::lock_acquire "map_load:$path"; 2065 my $guard = cf::lock_acquire "map_data:$path";
1780 2066
2067 return unless $self->valid;
1781 return if $self->in_memory != cf::MAP_SWAPPED; 2068 return unless $self->in_memory == cf::MAP_SWAPPED;
1782 2069
1783 $self->in_memory (cf::MAP_LOADING); 2070 $self->in_memory (cf::MAP_LOADING);
1784 2071
1785 $self->alloc; 2072 $self->alloc;
1786 2073
1787 $self->pre_load; 2074 $self->pre_load;
1788 Coro::cede; 2075 cf::cede_to_tick;
1789 2076
2077 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block;
1790 $self->_load_objects ($self->{load_path}, 1) 2079 $self->_load_objects ($f)
1791 or return; 2080 or return;
1792 2081
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794 if delete $self->{load_original}; 2083 if delete $self->{load_original};
1795 2084
1796 if (my $uniq = $self->uniq_path) { 2085 if (my $uniq = $self->uniq_path) {
1797 utf8::encode $uniq; 2086 utf8::encode $uniq;
1798 if (aio_open $uniq, O_RDONLY, 0) { 2087 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) {
1799 $self->clear_unique_items; 2089 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 2090 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs;
2092 }
1801 } 2093 }
1802 } 2094 }
1803 2095
1804 Coro::cede; 2096 $f->resolve_delayed_derefs;
2097
2098 cf::cede_to_tick;
1805 # now do the right thing for maps 2099 # now do the right thing for maps
1806 $self->link_multipart_objects; 2100 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 2101 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 2102 unless $self->difficulty;
1809 Coro::cede; 2103 cf::cede_to_tick;
1810 2104
1811 unless ($self->{deny_activate}) { 2105 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 2106 $self->decay_objects;
1813 $self->fix_auto_apply; 2107 $self->fix_auto_apply;
1814 $self->update_buttons; 2108 $self->update_buttons;
1815 Coro::cede; 2109 cf::cede_to_tick;
1816 $self->set_darkness_map; 2110 $self->set_darkness_map;
1817 Coro::cede; 2111 cf::cede_to_tick;
1818 $self->activate; 2112 $self->activate;
1819 } 2113 }
2114
2115 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME);
1820 2117
1821 $self->in_memory (cf::MAP_IN_MEMORY); 2118 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 2119 }
1823 2120
1824 $self->post_load; 2121 $self->post_load;
1835 2132
1836 $self 2133 $self
1837} 2134}
1838 2135
1839# 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
1840sub load_diag { 2137sub load_neighbours {
1841 my ($map) = @_; 2138 my ($map) = @_;
1842 2139
1843 my @diag; # diagonal neighbours 2140 my @neigh; # diagonal neighbours
1844 2141
1845 for (0 .. 3) { 2142 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 2143 my $neigh = $map->tile_path ($_)
1847 or next; 2144 or next;
1848 $neigh = find $neigh, $map 2145 $neigh = find $neigh, $map
1849 or next; 2146 or next;
1850 $neigh->load; 2147 $neigh->load;
1851 2148
2149 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2150 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2151 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 2152 }
1855 2153
1856 for (@diag) { 2154 for (grep defined $_->[0], @neigh) {
2155 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 2156 my $neigh = find $path, $origin
1858 or next; 2157 or next;
1859 $neigh->load; 2158 $neigh->load;
1860 } 2159 }
1861} 2160}
1862 2161
1867} 2166}
1868 2167
1869sub do_load_sync { 2168sub do_load_sync {
1870 my ($map) = @_; 2169 my ($map) = @_;
1871 2170
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main;
2173
1872 cf::sync_job { $map->load }; 2174 cf::sync_job { $map->load };
1873} 2175}
1874 2176
1875our %MAP_PREFETCH; 2177our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 2178our $MAP_PREFETCHER = undef;
1877 2179
1878sub find_async { 2180sub find_async {
1879 my ($path, $origin) = @_; 2181 my ($path, $origin, $load) = @_;
1880 2182
1881 $path = normalise $path, $origin && $origin->{path}; 2183 $path = normalise $path, $origin && $origin->{path};
1882 2184
1883 if (my $map = $cf::MAP{$path}) { 2185 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 2187 }
1886 2188
1887 undef $MAP_PREFETCH{$path}; 2189 $MAP_PREFETCH{$path} |= $load;
2190
1888 $MAP_PREFETCHER ||= cf::async { 2191 $MAP_PREFETCHER ||= cf::async {
2192 $Coro::current->{desc} = "map prefetcher";
2193
1889 while (%MAP_PREFETCH) { 2194 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 2195 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 2196 if (my $map = find $k) {
1892 or next;
1893 $map->load; 2197 $map->load if $v;
2198 }
1894 2199
1895 delete $MAP_PREFETCH{$path}; 2200 delete $MAP_PREFETCH{$k};
1896 } 2201 }
1897 } 2202 }
1898 undef $MAP_PREFETCHER; 2203 undef $MAP_PREFETCHER;
1899 }; 2204 };
1900 $MAP_PREFETCHER->prio (6); 2205 $MAP_PREFETCHER->prio (6);
1903} 2208}
1904 2209
1905sub save { 2210sub save {
1906 my ($self) = @_; 2211 my ($self) = @_;
1907 2212
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2214
1910 $self->{last_save} = $cf::RUNTIME; 2215 $self->{last_save} = $cf::RUNTIME;
1911 2216
1912 return unless $self->dirty; 2217 return unless $self->dirty;
1913 2218
1919 return if $self->{deny_save}; 2224 return if $self->{deny_save};
1920 2225
1921 local $self->{last_access} = $self->last_access;#d# 2226 local $self->{last_access} = $self->last_access;#d#
1922 2227
1923 cf::async { 2228 cf::async {
2229 $Coro::current->{desc} = "map player save";
1924 $_->contr->save for $self->players; 2230 $_->contr->save for $self->players;
1925 }; 2231 };
1926 2232
1927 if ($uniq) { 2233 if ($uniq) {
1928 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1936 my ($self) = @_; 2242 my ($self) = @_;
1937 2243
1938 # save first because save cedes 2244 # save first because save cedes
1939 $self->save; 2245 $self->save;
1940 2246
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2247 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2248
1943 return if $self->players; 2249 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2251 return if $self->{deny_save};
1946 2252
2253 $self->in_memory (cf::MAP_SWAPPED);
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
1947 $self->clear; 2257 $self->clear;
1948 $self->in_memory (cf::MAP_SWAPPED);
1949} 2258}
1950 2259
1951sub reset_at { 2260sub reset_at {
1952 my ($self) = @_; 2261 my ($self) = @_;
1953 2262
1985 if $uniq; 2294 if $uniq;
1986 } 2295 }
1987 2296
1988 delete $cf::MAP{$self->path}; 2297 delete $cf::MAP{$self->path};
1989 2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
1990 $self->clear; 2301 $self->clear;
1991
1992 $_->clear_links_to ($self) for values %cf::MAP;
1993 2302
1994 $self->unlink_save; 2303 $self->unlink_save;
1995 $self->destroy; 2304 $self->destroy;
1996} 2305}
1997 2306
1998my $nuke_counter = "aaaa"; 2307my $nuke_counter = "aaaa";
1999 2308
2000sub nuke { 2309sub nuke {
2001 my ($self) = @_; 2310 my ($self) = @_;
2002 2311
2312 {
2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314
2003 delete $cf::MAP{$self->path}; 2315 delete $cf::MAP{$self->path};
2004 2316
2005 $self->unlink_save; 2317 $self->unlink_save;
2006 2318
2007 bless $self, "cf::map"; 2319 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2320 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2321 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2322 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2324
2013 $cf::MAP{$self->path} = $self; 2325 $cf::MAP{$self->path} = $self;
2326 }
2014 2327
2015 $self->reset; # polite request, might not happen 2328 $self->reset; # polite request, might not happen
2016} 2329}
2017 2330
2018=item $maps = cf::map::tmp_maps 2331=item $maps = cf::map::tmp_maps
2060 2373
2061sub unique_maps() { 2374sub unique_maps() {
2062 [ 2375 [
2063 map { 2376 map {
2064 utf8::decode $_; 2377 utf8::decode $_;
2065 /\.map$/ 2378 s/\.map$//; # TODO future compatibility hack
2379 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2380 ? ()
2066 ? normalise $_ 2381 : normalise $_
2067 : ()
2068 } @{ aio_readdir $UNIQUEDIR or [] } 2382 } @{ aio_readdir $UNIQUEDIR or [] }
2069 ] 2383 ]
2070} 2384}
2071 2385
2072package cf;
2073
2074=back 2386=back
2075 2387
2076=head3 cf::object 2388=head3 cf::object
2077 2389
2078=cut 2390=cut
2081 2393
2082=over 4 2394=over 4
2083 2395
2084=item $ob->inv_recursive 2396=item $ob->inv_recursive
2085 2397
2086Returns the inventory of the object _and_ their inventories, recursively. 2398Returns the inventory of the object I<and> their inventories, recursively,
2399but I<not> the object itself.
2087 2400
2088=cut 2401=cut
2089 2402
2090sub inv_recursive_; 2403sub inv_recursive_;
2091sub inv_recursive_ { 2404sub inv_recursive_ {
2092 map { $_, inv_recursive_ $_->inv } @_ 2405 map { $_, inv_recursive_ $_->inv } @_
2093} 2406}
2094 2407
2095sub inv_recursive { 2408sub inv_recursive {
2096 inv_recursive_ inv $_[0] 2409 inv_recursive_ inv $_[0]
2410}
2411
2412=item $ref = $ob->ref
2413
2414Creates and returns a persistent reference to an object that can be stored as a string.
2415
2416=item $ob = cf::object::deref ($refstring)
2417
2418returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2419even if the object actually exists. May block.
2420
2421=cut
2422
2423sub deref {
2424 my ($ref) = @_;
2425
2426 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2427 my ($uuid, $name) = ($1, $2);
2428 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2429 or return;
2430 $pl->ob->uuid eq $uuid
2431 or return;
2432
2433 $pl->ob
2434 } else {
2435 warn "$ref: cannot resolve object reference\n";
2436 undef
2437 }
2097} 2438}
2098 2439
2099package cf; 2440package cf;
2100 2441
2101=back 2442=back
2125 2466
2126 } else { 2467 } else {
2127 my $pl = $self->contr; 2468 my $pl = $self->contr;
2128 2469
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2470 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2471 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2472 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2473
2138 } else { 2474 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2475 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2476 $self->message ($msg, $flags);
2141 } 2477 }
2142 } 2478 }
2479}
2480
2481=item $object->send_msg ($channel, $msg, $color, [extra...])
2482
2483=cut
2484
2485sub cf::object::send_msg {
2486 my $pl = shift->contr
2487 or return;
2488 $pl->send_msg (@_);
2143} 2489}
2144 2490
2145=item $player_object->may ("access") 2491=item $player_object->may ("access")
2146 2492
2147Returns wether the given player is authorized to access resource "access" 2493Returns wether the given player is authorized to access resource "access"
2226 # use -1 or undef as default coordinates, not 0, 0 2572 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2573 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2574 if $x <=0 && $y <= 0;
2229 2575
2230 $map->load; 2576 $map->load;
2231 $map->load_diag; 2577 $map->load_neighbours;
2232 2578
2233 return unless $self->contr->active; 2579 return unless $self->contr->active;
2234 $self->activate_recursive; 2580 $self->activate_recursive;
2235 2581
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2582 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2583 $self->enter_map ($map, $x, $y);
2238} 2584}
2239 2585
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2586=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2587
2242Moves the player to the given map-path and coordinates by first freezing 2588Moves the player to the given map-path and coordinates by first freezing
2243her, loading and preparing them map, calling the provided $check callback 2589her, loading and preparing them map, calling the provided $check callback
2244that has to return the map if sucecssful, and then unfreezes the player on 2590that has to return the map if sucecssful, and then unfreezes the player on
2245the new (success) or old (failed) map position. 2591the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process.
2246 2593
2247=cut 2594=cut
2248 2595
2249our $GOTOGEN; 2596our $GOTOGEN;
2250 2597
2251sub cf::object::player::goto { 2598sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2599 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2600
2254 # do generation counting so two concurrent goto's will be executed in-order 2601 # do generation counting so two concurrent goto's will be executed in-order
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2602 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2603
2257 $self->enter_link; 2604 $self->enter_link;
2258 2605
2259 (async { 2606 (async {
2607 $Coro::current->{desc} = "player::goto $path $x $y";
2608
2609 # *tag paths override both path and x|y
2610 if ($path =~ /^\*(.*)$/) {
2611 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2612 my $ob = $obs[rand @obs];
2613
2614 # see if we actually can go there
2615 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2616 $ob = $obs[rand @obs];
2617 } else {
2618 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2619 }
2620 # else put us there anyways for now #d#
2621
2622 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2623 } else {
2624 ($path, $x, $y) = (undef, undef, undef);
2625 }
2626 }
2627
2260 my $map = eval { 2628 my $map = eval {
2261 my $map = cf::map::find $path; 2629 my $map = defined $path ? cf::map::find $path : undef;
2262 2630
2263 if ($map) { 2631 if ($map) {
2264 $map = $map->customise_for ($self); 2632 $map = $map->customise_for ($self);
2265 $map = $check->($map) if $check && $map; 2633 $map = $check->($map) if $check && $map;
2266 } else { 2634 } else {
2267 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2635 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2268 } 2636 }
2269 2637
2270 $map 2638 $map
2271 }; 2639 };
2272 2640
2277 2645
2278 if ($gen == $self->{_goto_generation}) { 2646 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2647 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2648 $self->leave_link ($map, $x, $y);
2281 } 2649 }
2650
2651 $done->() if $done;
2282 })->prio (1); 2652 })->prio (1);
2283} 2653}
2284 2654
2285=item $player_object->enter_exit ($exit_object) 2655=item $player_object->enter_exit ($exit_object)
2286 2656
2323 $rmp->{origin_y} = $exit->y; 2693 $rmp->{origin_y} = $exit->y;
2324 } 2694 }
2325 2695
2326 $rmp->{random_seed} ||= $exit->random_seed; 2696 $rmp->{random_seed} ||= $exit->random_seed;
2327 2697
2328 my $data = cf::to_json $rmp; 2698 my $data = cf::encode_json $rmp;
2329 my $md5 = Digest::MD5::md5_hex $data; 2699 my $md5 = Digest::MD5::md5_hex $data;
2330 my $meta = "$RANDOMDIR/$md5.meta"; 2700 my $meta = "$RANDOMDIR/$md5.meta";
2331 2701
2332 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2333 aio_write $fh, 0, (length $data), $data, 0; 2703 aio_write $fh, 0, (length $data), $data, 0;
2355 my $hp = $exit->stats->hp; 2725 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2726 my $sp = $exit->stats->sp;
2357 2727
2358 $self->enter_link; 2728 $self->enter_link;
2359 2729
2730 # if exit is damned, update players death & WoR home-position
2731 $self->contr->savebed ($slaying, $hp, $sp)
2732 if $exit->flag (FLAG_DAMNED);
2733
2360 (async { 2734 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2736
2361 $self->deactivate_recursive; # just to be sure 2737 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2738 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2739 $self->goto ($slaying, $hp, $sp);
2364 2740
2365 1; 2741 1;
2391 2767
2392 utf8::encode $text; 2768 utf8::encode $text;
2393 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2769 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2394} 2770}
2395 2771
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2772=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2773
2398Send a drawinfo or msg packet to the client, formatting the msg for the 2774Send a drawinfo or msg packet to the client, formatting the msg for the
2399client if neccessary. C<$type> should be a string identifying the type of 2775client if neccessary. C<$type> should be a string identifying the type of
2400the message, with C<log> being the default. If C<$color> is negative, suppress 2776the message, with C<log> being the default. If C<$color> is negative, suppress
2401the message unless the client supports the msg packet. 2777the message unless the client supports the msg packet.
2402 2778
2403=cut 2779=cut
2404 2780
2781# non-persistent channels (usually the info channel)
2782our %CHANNEL = (
2783 "c/identify" => {
2784 id => "infobox",
2785 title => "Identify",
2786 reply => undef,
2787 tooltip => "Items recently identified",
2788 },
2789 "c/examine" => {
2790 id => "infobox",
2791 title => "Examine",
2792 reply => undef,
2793 tooltip => "Signs and other items you examined",
2794 },
2795 "c/book" => {
2796 id => "infobox",
2797 title => "Book",
2798 reply => undef,
2799 tooltip => "The contents of a note or book",
2800 },
2801 "c/lookat" => {
2802 id => "infobox",
2803 title => "Look",
2804 reply => undef,
2805 tooltip => "What you saw there",
2806 },
2807 "c/who" => {
2808 id => "infobox",
2809 title => "Players",
2810 reply => undef,
2811 tooltip => "Shows players who are currently online",
2812 },
2813 "c/body" => {
2814 id => "infobox",
2815 title => "Body Parts",
2816 reply => undef,
2817 tooltip => "Shows which body parts you posess and are available",
2818 },
2819 "c/uptime" => {
2820 id => "infobox",
2821 title => "Uptime",
2822 reply => undef,
2823 tooltip => "How long the server has been running since last restart",
2824 },
2825 "c/mapinfo" => {
2826 id => "infobox",
2827 title => "Map Info",
2828 reply => undef,
2829 tooltip => "Information related to the maps",
2830 },
2831);
2832
2405sub cf::client::send_msg { 2833sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2834 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2835
2408 $msg = $self->pl->expand_cfpod ($msg); 2836 $msg = $self->pl->expand_cfpod ($msg);
2409 2837
2838 $color &= cf::NDI_CLIENT_MASK; # just in case...
2839
2840 # check predefined channels, for the benefit of C
2841 if ($CHANNEL{$channel}) {
2842 $channel = $CHANNEL{$channel};
2843
2844 $self->ext_msg (channel_info => $channel)
2845 if $self->can_msg;
2846
2847 $channel = $channel->{id};
2848
2849 } elsif (ref $channel) {
2850 # send meta info to client, if not yet sent
2851 unless (exists $self->{channel}{$channel->{id}}) {
2852 $self->{channel}{$channel->{id}} = $channel;
2853 $self->ext_msg (channel_info => $channel)
2854 if $self->can_msg;
2855 }
2856
2857 $channel = $channel->{id};
2858 }
2859
2860 return unless @extra || length $msg;
2861
2410 if ($self->can_msg) { 2862 if ($self->can_msg) {
2863 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF;
2866
2411 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2867 $self->send_packet ("msg " . $self->{json_coder}->encode (
2868 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412 } else { 2869 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 if ($color >= 0) { 2870 if ($color >= 0) {
2871 # replace some tags by gcfclient-compatible ones
2872 for ($msg) {
2873 1 while
2874 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2875 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2876 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2877 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2878 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2879 }
2880
2881 $color &= cf::NDI_COLOR_MASK;
2882
2883 utf8::encode $msg;
2884
2424 if (0 && $msg =~ /\[/) { 2885 if (0 && $msg =~ /\[/) {
2886 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2887 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2888 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2889 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2890 $self->send_packet ("drawinfo $color $msg")
2429 } 2891 }
2430 } 2892 }
2431 } 2893 }
2432} 2894}
2433 2895
2434=item $client->ext_event ($type, %msg) 2896=item $client->ext_msg ($type, @msg)
2435 2897
2436Sends an ext event to the client. 2898Sends an ext event to the client.
2437 2899
2438=cut 2900=cut
2439 2901
2440sub cf::client::ext_event($$%) { 2902sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2903 my ($self, $type, @msg) = @_;
2442 2904
2905 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2907 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2908 push @msg, msgtype => "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2909 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2910 }
2911}
2912
2913=item $client->ext_reply ($msgid, @msg)
2914
2915Sends an ext reply to the client.
2916
2917=cut
2918
2919sub cf::client::ext_reply($$@) {
2920 my ($self, $id, @msg) = @_;
2921
2922 if ($self->extcmd == 2) {
2923 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2924 } elsif ($self->extcmd == 1) {
2925 #TODO: version 1, remove
2926 unshift @msg, msgtype => "reply", msgid => $id;
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2928 }
2445} 2929}
2446 2930
2447=item $success = $client->query ($flags, "text", \&cb) 2931=item $success = $client->query ($flags, "text", \&cb)
2448 2932
2449Queues a query to the client, calling the given callback with 2933Queues a query to the client, calling the given callback with
2504 my ($ns, $buf) = @_; 2988 my ($ns, $buf) = @_;
2505 2989
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2990 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2991
2508 if (ref $msg) { 2992 if (ref $msg) {
2993 my ($type, $reply, @payload) =
2994 "ARRAY" eq ref $msg
2995 ? @$msg
2996 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2997
2998 my @reply;
2999
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3000 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 3001 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 3002 }
3003
3004 $ns->ext_reply ($reply, @reply)
3005 if $reply;
3006
2515 } else { 3007 } else {
2516 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3008 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517 } 3009 }
2518 3010
2519 cf::override; 3011 cf::override;
2566our $safe = new Safe "safe"; 3058our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 3059our $safe_hole = new Safe::Hole;
2568 3060
2569$SIG{FPE} = 'IGNORE'; 3061$SIG{FPE} = 'IGNORE';
2570 3062
2571$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3063$safe->permit_only (Opcode::opset qw(
3064 :base_core :base_mem :base_orig :base_math
3065 grepstart grepwhile mapstart mapwhile
3066 sort time
3067));
2572 3068
2573# here we export the classes and methods available to script code 3069# here we export the classes and methods available to script code
2574 3070
2575=pod 3071=pod
2576 3072
2577The following functions and methods are available within a safe environment: 3073The following functions and methods are available within a safe environment:
2578 3074
2579 cf::object contr pay_amount pay_player map 3075 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr
3078
2580 cf::object::player player 3079 cf::object::player
2581 cf::player peaceful 3080 player
2582 cf::map trigger 3081
3082 cf::player
3083 peaceful
3084
3085 cf::map
3086 trigger
2583 3087
2584=cut 3088=cut
2585 3089
2586for ( 3090for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race
3093 decrease_ob_nr destroy)],
2588 ["cf::object::player" => qw(player)], 3094 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 3095 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 3096 ["cf::map" => qw(trigger)],
2591) { 3097) {
2592 no strict 'refs'; 3098 no strict 'refs';
2668# the server's init and main functions 3174# the server's init and main functions
2669 3175
2670sub load_facedata($) { 3176sub load_facedata($) {
2671 my ($path) = @_; 3177 my ($path) = @_;
2672 3178
3179 # HACK to clear player env face cache, we need some signal framework
3180 # for this (global event?)
3181 %ext::player_env::MUSIC_FACE_CACHE = ();
3182
3183 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3184
2673 warn "loading facedata from $path\n"; 3185 warn "loading facedata from $path\n";
2674 3186
2675 my $facedata; 3187 my $facedata;
2676 0 < aio_load $path, $facedata 3188 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 3189 or die "$path: $!";
2679 $facedata = Coro::Storable::thaw $facedata; 3191 $facedata = Coro::Storable::thaw $facedata;
2680 3192
2681 $facedata->{version} == 2 3193 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 3194 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 3195
3196 # patch in the exptable
3197 $facedata->{resource}{"res/exp_table"} = {
3198 type => FT_RSRC,
3199 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3200 };
3201 cf::cede_to_tick;
3202
2684 { 3203 {
2685 my $faces = $facedata->{faceinfo}; 3204 my $faces = $facedata->{faceinfo};
2686 3205
2687 while (my ($face, $info) = each %$faces) { 3206 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3207 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3208
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3209 cf::face::set_visibility $idx, $info->{visibility};
3210 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3211 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3212 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 3213
3214 cf::cede_to_tick;
2693 } 3215 }
2694 3216
2695 while (my ($face, $info) = each %$faces) { 3217 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 3218 next unless $info->{smooth};
3219
2697 my $idx = cf::face::find $face 3220 my $idx = cf::face::find $face
2698 or next; 3221 or next;
3222
2699 if (my $smooth = cf::face::find $info->{smooth}) { 3223 if (my $smooth = cf::face::find $info->{smooth}) {
3224 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3225 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 3226 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3227 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 3228 }
2704 Coro::cede; 3229
3230 cf::cede_to_tick;
2705 } 3231 }
2706 } 3232 }
2707 3233
2708 { 3234 {
2709 my $anims = $facedata->{animinfo}; 3235 my $anims = $facedata->{animinfo};
2710 3236
2711 while (my ($anim, $info) = each %$anims) { 3237 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3238 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 3239 cf::cede_to_tick;
2714 } 3240 }
2715 3241
2716 cf::anim::invalidate_all; # d'oh 3242 cf::anim::invalidate_all; # d'oh
2717 } 3243 }
2718 3244
3245 {
3246 # TODO: for gcfclient pleasure, we should give resources
3247 # that gcfclient doesn't grok a >10000 face index.
3248 my $res = $facedata->{resource};
3249
3250 while (my ($name, $info) = each %$res) {
3251 if (defined $info->{type}) {
3252 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3253 my $data;
3254
3255 if ($info->{type} & 1) {
3256 # prepend meta info
3257
3258 my $meta = $enc->encode ({
3259 name => $name,
3260 %{ $info->{meta} || {} },
3261 });
3262
3263 $data = pack "(w/a*)*", $meta, $info->{data};
3264 } else {
3265 $data = $info->{data};
3266 }
3267
3268 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3269 cf::face::set_type $idx, $info->{type};
3270 } else {
3271 $RESOURCE{$name} = $info;
3272 }
3273
3274 cf::cede_to_tick;
3275 }
3276 }
3277
3278 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3279
2719 1 3280 1
2720} 3281}
2721 3282
3283cf::global->attach (on_resource_update => sub {
3284 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3285 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3286
3287 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3288 my $sound = $soundconf->{compat}[$_]
3289 or next;
3290
3291 my $face = cf::face::find "sound/$sound->[1]";
3292 cf::sound::set $sound->[0] => $face;
3293 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3294 }
3295
3296 while (my ($k, $v) = each %{$soundconf->{event}}) {
3297 my $face = cf::face::find "sound/$v";
3298 cf::sound::set $k => $face;
3299 }
3300 }
3301});
3302
3303register_exticmd fx_want => sub {
3304 my ($ns, $want) = @_;
3305
3306 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v);
3308 }
3309};
3310
2722sub reload_regions { 3311sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = ();
3315
2723 load_resource_file "$MAPDIR/regions" 3316 load_resource_file "$MAPDIR/regions"
2724 or die "unable to load regions file\n"; 3317 or die "unable to load regions file\n";
3318
3319 for (cf::region::list) {
3320 $_->{match} = qr/$_->{match}/
3321 if exists $_->{match};
3322 }
2725} 3323}
2726 3324
2727sub reload_facedata { 3325sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3326 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3327 or die "unable to load facedata\n";
2758 3356
2759sub init { 3357sub init {
2760 reload_resources; 3358 reload_resources;
2761} 3359}
2762 3360
2763sub cfg_load { 3361sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3362 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3363 or return;
2766 3364
2767 local $/; 3365 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3366 *CFG = YAML::Load <$fh>;
2769 3367
2770 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3368 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2771 3369
2772 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3370 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2773 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3371 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2784sub main { 3382sub main {
2785 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
2786 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
2787 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2788 (async { 3386 (async {
2789 Event::one_event; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT;
2790 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
2791 }; 3390 };
2792 3391
2793 cfg_load; 3392 reload_config;
2794 db_init; 3393 db_init;
2795 load_extensions; 3394 load_extensions;
2796 3395
2797 $TICK_WATCHER->start; 3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno;
2798 Event::loop; 3398 EV::loop;
2799} 3399}
2800 3400
2801############################################################################# 3401#############################################################################
2802# initialisation and cleanup 3402# initialisation and cleanup
2803 3403
2804# install some emergency cleanup handlers 3404# install some emergency cleanup handlers
2805BEGIN { 3405BEGIN {
3406 our %SIGWATCHER = ();
2806 for my $signal (qw(INT HUP TERM)) { 3407 for my $signal (qw(INT HUP TERM)) {
2807 Event->signal ( 3408 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2808 reentrant => 0,
2809 data => WF_AUTOCANCEL,
2810 signal => $signal,
2811 prio => 0,
2812 cb => sub {
2813 cf::cleanup "SIG$signal"; 3409 cf::cleanup "SIG$signal";
2814 },
2815 ); 3410 };
2816 } 3411 }
2817} 3412}
2818 3413
2819sub write_runtime { 3414sub write_runtime_sync {
2820 my $runtime = "$LOCALDIR/runtime"; 3415 my $runtime = "$LOCALDIR/runtime";
2821 3416
2822 # first touch the runtime file to show we are still running: 3417 # first touch the runtime file to show we are still running:
2823 # the fsync below can take a very very long time. 3418 # the fsync below can take a very very long time.
2824 3419
2850 and return; 3445 and return;
2851 3446
2852 warn "runtime file written.\n"; 3447 warn "runtime file written.\n";
2853 3448
2854 1 3449 1
3450}
3451
3452our $uuid_lock;
3453our $uuid_skip;
3454
3455sub write_uuid_sync($) {
3456 $uuid_skip ||= $_[0];
3457
3458 return if $uuid_lock;
3459 local $uuid_lock = 1;
3460
3461 my $uuid = "$LOCALDIR/uuid";
3462
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return;
3465
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3467 $uuid_skip = 0;
3468
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return;
3471
3472 # always fsync - this file is important
3473 aio_fsync $fh
3474 and return;
3475
3476 close $fh
3477 or return;
3478
3479 aio_rename "$uuid~", $uuid
3480 and return;
3481
3482 warn "uuid file written ($value).\n";
3483
3484 1
3485
3486}
3487
3488sub write_uuid($$) {
3489 my ($skip, $sync) = @_;
3490
3491 $sync ? write_uuid_sync $skip
3492 : async { write_uuid_sync $skip };
2855} 3493}
2856 3494
2857sub emergency_save() { 3495sub emergency_save() {
2858 my $freeze_guard = cf::freeze_mainloop; 3496 my $freeze_guard = cf::freeze_mainloop;
2859 3497
2865 # and maps saved/destroyed asynchronously. 3503 # and maps saved/destroyed asynchronously.
2866 warn "begin emergency player save\n"; 3504 warn "begin emergency player save\n";
2867 for my $login (keys %cf::PLAYER) { 3505 for my $login (keys %cf::PLAYER) {
2868 my $pl = $cf::PLAYER{$login} or next; 3506 my $pl = $cf::PLAYER{$login} or next;
2869 $pl->valid or next; 3507 $pl->valid or next;
3508 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2870 $pl->save; 3509 $pl->save;
2871 } 3510 }
2872 warn "end emergency player save\n"; 3511 warn "end emergency player save\n";
2873 3512
2874 warn "begin emergency map save\n"; 3513 warn "begin emergency map save\n";
2880 warn "end emergency map save\n"; 3519 warn "end emergency map save\n";
2881 3520
2882 warn "begin emergency database checkpoint\n"; 3521 warn "begin emergency database checkpoint\n";
2883 BDB::db_env_txn_checkpoint $DB_ENV; 3522 BDB::db_env_txn_checkpoint $DB_ENV;
2884 warn "end emergency database checkpoint\n"; 3523 warn "end emergency database checkpoint\n";
3524
3525 warn "begin write uuid\n";
3526 write_uuid_sync 1;
3527 warn "end write uuid\n";
2885 }; 3528 };
2886 3529
2887 warn "leave emergency perl save\n"; 3530 warn "leave emergency perl save\n";
2888} 3531}
2889 3532
2904 warn "reloading..."; 3547 warn "reloading...";
2905 3548
2906 warn "entering sync_job"; 3549 warn "entering sync_job";
2907 3550
2908 cf::sync_job { 3551 cf::sync_job {
2909 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
2910 cf::emergency_save; 3553 cf::emergency_save;
2911 cf::write_runtime; # external watchdog should not bark 3554 cf::write_runtime_sync; # external watchdog should not bark
2912 3555
2913 warn "syncing database to disk"; 3556 warn "syncing database to disk";
2914 BDB::db_env_txn_checkpoint $DB_ENV; 3557 BDB::db_env_txn_checkpoint $DB_ENV;
2915 3558
2916 # if anything goes wrong in here, we should simply crash as we already saved 3559 # if anything goes wrong in here, we should simply crash as we already saved
2917
2918 warn "cancelling all WF_AUTOCANCEL watchers";
2919 for (Event::all_watchers) {
2920 $_->cancel if $_->data & WF_AUTOCANCEL;
2921 }
2922 3560
2923 warn "flushing outstanding aio requests"; 3561 warn "flushing outstanding aio requests";
2924 for (;;) { 3562 for (;;) {
2925 BDB::flush; 3563 BDB::flush;
2926 IO::AIO::flush; 3564 IO::AIO::flush;
2927 Coro::cede; 3565 Coro::cede_notself;
2928 last unless IO::AIO::nreqs || BDB::nreqs; 3566 last unless IO::AIO::nreqs || BDB::nreqs;
2929 warn "iterate..."; 3567 warn "iterate...";
2930 } 3568 }
2931 3569
2932 ++$RELOAD; 3570 ++$RELOAD;
2991 warn "reloading cf.pm"; 3629 warn "reloading cf.pm";
2992 require cf; 3630 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3632
2995 warn "loading config and database again"; 3633 warn "loading config and database again";
2996 cf::cfg_load; 3634 cf::reload_config;
2997 3635
2998 warn "loading extensions"; 3636 warn "loading extensions";
2999 cf::load_extensions; 3637 cf::load_extensions;
3000 3638
3001 warn "reattaching attachments to objects/players"; 3639 warn "reattaching attachments to objects/players";
3008 warn "leaving sync_job"; 3646 warn "leaving sync_job";
3009 3647
3010 1 3648 1
3011 } or do { 3649 } or do {
3012 warn $@; 3650 warn $@;
3013 warn "error while reloading, exiting."; 3651 cf::cleanup "error while reloading, exiting.";
3014 exit 1;
3015 }; 3652 };
3016 3653
3017 warn "reloaded"; 3654 warn "reloaded";
3018}; 3655};
3019 3656
3021 3658
3022sub reload_perl() { 3659sub reload_perl() {
3023 # doing reload synchronously and two reloads happen back-to-back, 3660 # doing reload synchronously and two reloads happen back-to-back,
3024 # coro crashes during coro_state_free->destroy here. 3661 # coro crashes during coro_state_free->destroy here.
3025 3662
3026 $RELOAD_WATCHER ||= Event->timer ( 3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3027 reentrant => 0,
3028 after => 0,
3029 data => WF_AUTOCANCEL,
3030 cb => sub {
3031 do_reload_perl; 3664 do_reload_perl;
3032 undef $RELOAD_WATCHER; 3665 undef $RELOAD_WATCHER;
3033 },
3034 ); 3666 };
3035} 3667}
3036 3668
3037register_command "reload" => sub { 3669register_command "reload" => sub {
3038 my ($who, $arg) = @_; 3670 my ($who, $arg) = @_;
3039 3671
3040 if ($who->flag (FLAG_WIZ)) { 3672 if ($who->flag (FLAG_WIZ)) {
3041 $who->message ("reloading server."); 3673 $who->message ("reloading server.");
3674 async {
3675 $Coro::current->{desc} = "perl_reload";
3042 async { reload_perl }; 3676 reload_perl;
3677 };
3043 } 3678 }
3044}; 3679};
3045 3680
3046unshift @INC, $LIBDIR; 3681unshift @INC, $LIBDIR;
3047 3682
3049 3684
3050our @WAIT_FOR_TICK; 3685our @WAIT_FOR_TICK;
3051our @WAIT_FOR_TICK_BEGIN; 3686our @WAIT_FOR_TICK_BEGIN;
3052 3687
3053sub wait_for_tick { 3688sub wait_for_tick {
3054 return unless $TICK_WATCHER->is_active; 3689 return if tick_inhibit;
3055 return if $Coro::current == $Coro::main; 3690 return if $Coro::current == $Coro::main;
3056 3691
3057 my $signal = new Coro::Signal; 3692 my $signal = new Coro::Signal;
3058 push @WAIT_FOR_TICK, $signal; 3693 push @WAIT_FOR_TICK, $signal;
3059 $signal->wait; 3694 $signal->wait;
3060} 3695}
3061 3696
3062sub wait_for_tick_begin { 3697sub wait_for_tick_begin {
3063 return unless $TICK_WATCHER->is_active; 3698 return if tick_inhibit;
3064 return if $Coro::current == $Coro::main; 3699 return if $Coro::current == $Coro::main;
3065 3700
3066 my $signal = new Coro::Signal; 3701 my $signal = new Coro::Signal;
3067 push @WAIT_FOR_TICK_BEGIN, $signal; 3702 push @WAIT_FOR_TICK_BEGIN, $signal;
3068 $signal->wait; 3703 $signal->wait;
3069} 3704}
3070 3705
3071 my $min = 1e6;#d# 3706sub tick {
3072 my $avg = 10;
3073$TICK_WATCHER = Event->timer (
3074 reentrant => 0,
3075 parked => 1,
3076 prio => 0,
3077 at => $NEXT_TICK || $TICK,
3078 data => WF_AUTOCANCEL,
3079 cb => sub {
3080 if ($Coro::current != $Coro::main) { 3707 if ($Coro::current != $Coro::main) {
3081 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3708 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3082 unless ++$bug_warning > 10; 3709 unless ++$bug_warning > 10;
3083 return; 3710 return;
3084 } 3711 }
3085 3712
3086 $NOW = $tick_start = Event::time;
3087
3088 cf::server_tick; # one server iteration 3713 cf::server_tick; # one server iteration
3089 3714
3090 0 && sync_job {#d# 3715 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3091 for(1..10) { 3716 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3092 my $t = Event::time; 3717 Coro::async_pool {
3093 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3718 $Coro::current->{desc} = "runtime saver";
3094 or die; 3719 write_runtime_sync
3095 3720 or warn "ERROR: unable to write runtime file: $!";
3096 $map->width (50);
3097 $map->height (50);
3098 $map->alloc;
3099 $map->_load_objects ("/tmp/x.map", 1);
3100 my $t = Event::time - $t;
3101
3102 #next unless $t < 0.0013;#d#
3103 if ($t < $min) {
3104 $min = $t;
3105 }
3106 $avg = $avg * 0.99 + $t * 0.01;
3107 }
3108 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3109 exit 0;
3110 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3111 }; 3721 };
3722 }
3112 3723
3113 $RUNTIME += $TICK;
3114 $NEXT_TICK += $TICK;
3115
3116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3117 $NEXT_RUNTIME_WRITE = $NOW + 10;
3118 Coro::async_pool {
3119 write_runtime
3120 or warn "ERROR: unable to write runtime file: $!";
3121 };
3122 }
3123
3124# my $AFTER = Event::time;
3125# warn $AFTER - $NOW;#d#
3126
3127 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3724 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3128 $sig->send; 3725 $sig->send;
3129 } 3726 }
3130 while (my $sig = shift @WAIT_FOR_TICK) { 3727 while (my $sig = shift @WAIT_FOR_TICK) {
3131 $sig->send; 3728 $sig->send;
3132 } 3729 }
3133 3730
3134 $NOW = Event::time; 3731 $LOAD = ($NOW - $TICK_START) / $TICK;
3135
3136 # if we are delayed by four ticks or more, skip them all
3137 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3138
3139 $TICK_WATCHER->at ($NEXT_TICK);
3140 $TICK_WATCHER->start;
3141
3142 $LOAD = ($NOW - $tick_start) / $TICK;
3143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3732 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144 3733
3145 _post_tick; 3734 if (0) {
3146 3735 if ($NEXT_TICK) {
3147 3736 my $jitter = $TICK_START - $NEXT_TICK;
3737 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3738 warn "jitter $JITTER\n";#d#
3739 }
3148 }, 3740 }
3149); 3741}
3150 3742
3151{ 3743{
3152 BDB::max_poll_time $TICK * 0.1; 3744 # configure BDB
3153 $BDB_POLL_WATCHER = Event->io ( 3745
3154 reentrant => 0,
3155 fd => BDB::poll_fileno,
3156 poll => 'r',
3157 prio => 0,
3158 data => WF_AUTOCANCEL,
3159 cb => \&BDB::poll_cb,
3160 );
3161 BDB::min_parallel 8; 3746 BDB::min_parallel 8;
3162 3747 BDB::max_poll_reqs $TICK * 0.1;
3163 BDB::set_sync_prepare { 3748 $Coro::BDB::WATCHER->priority (1);
3164 my $status;
3165 my $current = $Coro::current;
3166 (
3167 sub {
3168 $status = $!;
3169 $current->ready; undef $current;
3170 },
3171 sub {
3172 Coro::schedule while defined $current;
3173 $! = $status;
3174 },
3175 )
3176 };
3177 3749
3178 unless ($DB_ENV) { 3750 unless ($DB_ENV) {
3179 $DB_ENV = BDB::db_env_create; 3751 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3753 | BDB::LOG_AUTOREMOVE, 1);
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3180 3756
3181 cf::sync_job { 3757 cf::sync_job {
3182 eval { 3758 eval {
3183 BDB::db_env_open 3759 BDB::db_env_open
3184 $DB_ENV, 3760 $DB_ENV,
3186 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3762 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3187 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3763 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3188 0666; 3764 0666;
3189 3765
3190 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3766 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3191
3192 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3193 $DB_ENV->set_lk_detect;
3194 }; 3767 };
3195 3768
3196 cf::cleanup "db_env_open(db): $@" if $@; 3769 cf::cleanup "db_env_open(db): $@" if $@;
3197 }; 3770 };
3198 } 3771 }
3772
3773 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3774 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3775 };
3776 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3777 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3778 };
3779 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3780 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3781 };
3199} 3782}
3200 3783
3201{ 3784{
3785 # configure IO::AIO
3786
3202 IO::AIO::min_parallel 8; 3787 IO::AIO::min_parallel 8;
3203
3204 undef $Coro::AIO::WATCHER;
3205 IO::AIO::max_poll_time $TICK * 0.1; 3788 IO::AIO::max_poll_time $TICK * 0.1;
3206 $AIO_POLL_WATCHER = Event->io ( 3789 $Coro::AIO::WATCHER->priority (1);
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 fd => IO::AIO::poll_fileno,
3210 poll => 'r',
3211 prio => 6,
3212 cb => \&IO::AIO::poll_cb,
3213 );
3214} 3790}
3215 3791
3216my $_log_backtrace; 3792my $_log_backtrace;
3217 3793
3218sub _log_backtrace { 3794sub _log_backtrace {
3222 3798
3223 # limit the # of concurrent backtraces 3799 # limit the # of concurrent backtraces
3224 if ($_log_backtrace < 2) { 3800 if ($_log_backtrace < 2) {
3225 ++$_log_backtrace; 3801 ++$_log_backtrace;
3226 async { 3802 async {
3803 $Coro::current->{desc} = "abt $msg";
3804
3227 my @bt = fork_call { 3805 my @bt = fork_call {
3228 @addr = map { sprintf "%x", $_ } @addr; 3806 @addr = map { sprintf "%x", $_ } @addr;
3229 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3807 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3230 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3808 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3231 or die "addr2line: $!"; 3809 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines