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.304 by root, Wed Jul 11 16:55:18 2007 UTC vs.
Revision 1.425 by root, Mon Apr 21 06:35:26 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns 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
170per 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.
171 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
172=back 200=back
173 201
174=cut 202=cut
175 203
176BEGIN { 204BEGIN {
180 $msg .= "\n" 208 $msg .= "\n"
181 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
182 210
183 $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;
184 212
185 utf8::encode $msg;
186 LOG llevError, $msg; 213 LOG llevError, $msg;
187 }; 214 };
188} 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#?
189 231
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206)) { 248)) {
207 no strict 'refs'; 249 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 251}
210 252
211$Event::DIED = sub { 253$EV::DIED = sub {
212 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
213}; 255};
214 256
215############################################################################# 257#############################################################################
216 258
239 $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;
240 $d 282 $d
241 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
242} 284}
243 285
244=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
245 287
246Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
247 289
248=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
249 291
250Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
251 293
252=cut 294=cut
253 295
254our $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
255 297
256sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
258 300
259=item cf::lock_wait $string 301=item cf::lock_wait $string
260 302
261Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
262 304
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
268returned. 310returned.
269 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
270Lock 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
271uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
272 317
273=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
274 319
275Return 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.
276 321
277=cut 322=cut
278 323
279our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
280 326
281sub lock_wait($) { 327sub lock_wait($) {
282 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#
283 334
284 # wait for lock, if any 335 # wait for lock, if any
285 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 338 Coro::schedule;
293 344
294 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
295 lock_wait $key; 346 lock_wait $key;
296 347
297 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
298 350
299 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
302 } 355 }
303} 356}
304 357
307 360
308 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
309} 362}
310 363
311sub freeze_mainloop { 364sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
313 366
314 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
315 $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 }
316 }; 428 }
317 $TICK_WATCHER->stop; 429};
318 $guard 430
431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
434 my ($time, $pri, $name) = @_;
435
436 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal;
438
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready;
442 $sig->wait;
319} 443}
320 444
321=item cf::async { BLOCK } 445=item cf::async { BLOCK }
322 446
323Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
328 452
329BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
330 454
331=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
332 456
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 460acceptable.
337 461
338If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
344 468
345sub sync_job(&) { 469sub sync_job(&) {
346 my ($job) = @_; 470 my ($job) = @_;
347 471
348 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 473 my $time = EV::time;
350 474
351 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
353 477
354 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 479
356 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
357 481
358 my $busy = 1; 482 my $busy = 1;
359 my @res; 483 my @res;
360 484
361 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 487 @res = eval { $job->() };
363 warn $@ if $@; 488 warn $@ if $@;
364 undef $busy; 489 undef $busy;
365 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
366 491
367 while ($busy) { 492 while ($busy) {
368 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
369 } 497 }
498 }
370 499
371 $time = Event::time - $time; 500 my $time = EV::time - $time;
372 501
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
377 503
378 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
379 } else { 505 } else {
380 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
381 507
406=item fork_call { }, $args 532=item fork_call { }, $args
407 533
408Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
412 538
413=cut 539=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 540
424sub fork_call(&@) { 541sub fork_call(&@) {
425 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
426 543
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 544 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 547
432 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 549 reset_signals;
446 local $SIG{__WARN__}; 550 &$cb
447 local $SIG{__DIE__}; 551 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 552
454 eval { 553 wantarray ? @res : $res[-1]
455 close $fh1; 554}
456 555
457 my @res = eval { $cb->(@args) }; 556=item $coin = coin_from_name $name
458 557
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 558=cut
460 close $fh2;
461 };
462 559
463 warn $@ if $@; 560our %coin_alias = (
464 _exit 0; 561 "silver" => "silvercoin",
465 } 562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
466} 581}
467 582
468=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
469 584
470Returns a single value from the environment database. 585Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
473 588
474Stores the given C<$value> in the family. It can currently store binary 589Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 590data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 591
592=item $db = cf::db_table "name"
593
594Create and/or open a new database table. The string must not be "db" and must be unique
595within each server.
596
477=cut 597=cut
598
599sub db_table($) {
600 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV;
602
603 eval {
604 $db->set_flags (BDB::CHKSUM);
605
606 utf8::encode $name;
607 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
608 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
609 cf::cleanup "db_open(db): $!" if $!;
610 };
611 cf::cleanup "db_open(db): $@" if $@;
612
613 $db
614}
478 615
479our $DB; 616our $DB;
480 617
481sub db_init { 618sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 619 cf::sync_job {
486 eval { 620 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 621 };
496} 622}
497 623
498sub db_get($$) { 624sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
500 626
550 if (1) { 676 if (1) {
551 $md5 = 677 $md5 =
552 join "\x00", 678 join "\x00",
553 $processversion, 679 $processversion,
554 map { 680 map {
555 Coro::cede; 681 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 683 } 0.. $#$src;
558 684
559 685
560 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
604attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
606 732
607In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 735Deliantra).
610 736
611=over 4 737=over 4
612 738
613=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
614 740
866 "; 992 ";
867 die if $@; 993 die if $@;
868} 994}
869 995
870our $override; 996our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 997our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 998
873sub override { 999sub override {
874 $override = 1; 1000 $override = 1;
875 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
876} 1002}
877 1003
878sub do_invoke { 1004sub do_invoke {
879 my $event = shift; 1005 my $event = shift;
880 my $callbacks = shift; 1006 my $callbacks = shift;
881 1007
882 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
883 1009
884 local $override; 1010 local $override;
885 1011
886 for (@$callbacks) { 1012 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
896 } 1022 }
897 1023
898 0 1024 0
899} 1025}
900 1026
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1028
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1030
905Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
906 1032
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1033This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1034removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1036
911=back 1037=back
912 1038
913=cut 1039=cut
914 1040
915############################################################################# 1041#############################################################################
916# object support 1042# object support
1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
1077sub _can_merge {
1078 my ($ob1, $ob2) = @_;
1079
1080 ++$SLOW_MERGES;#d#
1081
1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
1084}
917 1085
918sub reattach { 1086sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1088 my ($obj) = @_;
921 1089
942cf::attachable->attach ( 1110cf::attachable->attach (
943 prio => -1000000, 1111 prio => -1000000,
944 on_instantiate => sub { 1112 on_instantiate => sub {
945 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
946 1114
947 $data = from_json $data; 1115 $data = decode_json $data;
948 1116
949 for (@$data) { 1117 for (@$data) {
950 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
951 1119
952 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1136sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
970 1138
971 sync_job { 1139 sync_job {
972 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
975 1144
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1146 chmod SAVE_MODE, $fh;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1149 close $fh;
981 1150
982 if (@$objs) { 1151 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1157 close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
990 } 1159 }
998 } 1167 }
999 } else { 1168 } else {
1000 aio_unlink $filename; 1169 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1002 } 1171 }
1003 } 1172 };
1004} 1173}
1005 1174
1006sub object_freezer_as_string { 1175sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1008 1177
1020 or return; 1189 or return;
1021 1190
1022 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1193 or return;
1194
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1026 } 1197 }
1027 1198
1199 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1030 return ($data, $av); 1203 ($data, $av)
1031} 1204}
1032 1205
1033=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1034 1207
1035=over 4 1208=over 4
1108 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1109 1282
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1284
1112 if (ref $msg) { 1285 if (ref $msg) {
1286 my ($type, $reply, @payload) =
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290
1291 my @reply;
1292
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1118 } else { 1300 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1302 }
1121 1303
1122 cf::override; 1304 cf::override;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1177 1359
1178 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1361 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1363 }
1183 1364
1184 warn $msg; 1365 warn $msg;
1185 } 1366 }
1186 1367
1211use Coro::AIO; 1392use Coro::AIO;
1212 1393
1213=head3 cf::player 1394=head3 cf::player
1214 1395
1215=over 4 1396=over 4
1397
1398=item cf::player::num_playing
1399
1400Returns the official number of playing players, as per the Crossfire metaserver rules.
1401
1402=cut
1403
1404sub num_playing {
1405 scalar grep
1406 $_->ob->map
1407 && !$_->hidden
1408 && !$_->ob->flag (cf::FLAG_WIZ),
1409 cf::player::list
1410}
1216 1411
1217=item cf::player::find $login 1412=item cf::player::find $login
1218 1413
1219Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1220 1415
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1455
1261 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1264 } 1464 }
1265 } 1465 }
1266} 1466}
1267 1467
1276 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1277 1477
1278 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1280 1480
1481 cf::get_slot 0.01;
1482
1281 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1282 Coro::cede; 1484 cf::cede_to_tick;
1283} 1485}
1284 1486
1285sub new($) { 1487sub new($) {
1286 my ($login) = @_; 1488 my ($login) = @_;
1287 1489
1291 $self->{deny_save} = 1; 1493 $self->{deny_save} = 1;
1292 1494
1293 $cf::PLAYER{$login} = $self; 1495 $cf::PLAYER{$login} = $self;
1294 1496
1295 $self 1497 $self
1498}
1499
1500=item $player->send_msg ($channel, $msg, $color, [extra...])
1501
1502=cut
1503
1504sub send_msg {
1505 my $ns = shift->ns
1506 or return;
1507 $ns->send_msg (@_);
1296} 1508}
1297 1509
1298=item $pl->quit_character 1510=item $pl->quit_character
1299 1511
1300Nukes the player without looking back. If logged in, the connection will 1512Nukes the player without looking back. If logged in, the connection will
1355 or return []; 1567 or return [];
1356 1568
1357 my @logins; 1569 my @logins;
1358 1570
1359 for my $login (@$dirs) { 1571 for my $login (@$dirs) {
1572 my $path = path $login;
1573
1574 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1577 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1578 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 }
1363 1580
1364 utf8::decode $login; 1581 utf8::decode $login;
1365 push @logins, $login; 1582 push @logins, $login;
1366 } 1583 }
1367 1584
1400 1617
1401Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1402 1619
1403=cut 1620=cut
1404 1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1405sub expand_cfpod { 1633sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1407 1635
1408 # escape & and < 1636 my $xml;
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1637
1412 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1413 1641
1414 1 while 1642 $group =~ s/&/&amp;/g;
1415 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1419 # replace G<male|female> tags 1647 ([BCGHITU])
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1648 <
1421 $self->gender ? $2 : $1 1649 (?:
1422 }ge 1650 ([^<>]*) (?{ $group = $^N })
1423 # replace H<hint text> 1651 | < $interior >
1424 || s{H<([^\>]*)>} 1652 )
1653 >
1654 %gcsx
1425 { 1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1675 "")
1429 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1430 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1431 1687
1688 for ($xml) {
1432 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1434 1691
1435 # compress some whitespace 1692 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1440 1698
1441 $_ 1699 $xml
1442} 1700}
1701
1702no re 'eval';
1443 1703
1444sub hintmode { 1704sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1706 $_[0]{hintmode}
1447} 1707}
1448 1708
1449=item $player->ext_reply ($msgid, %msg) 1709=item $player->ext_reply ($msgid, @msg)
1450 1710
1451Sends an ext reply to the player. 1711Sends an ext reply to the player.
1452 1712
1453=cut 1713=cut
1454 1714
1455sub ext_reply($$%) { 1715sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1716 my ($self, $id, @msg) = @_;
1457 1717
1458 $msg{msgid} = $id; 1718 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1719}
1461 1720
1462=item $player->ext_event ($type, %msg) 1721=item $player->ext_msg ($type, @msg)
1463 1722
1464Sends an ext event to the client. 1723Sends an ext event to the client.
1465 1724
1466=cut 1725=cut
1467 1726
1468sub ext_event($$%) { 1727sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1728 my ($self, $type, @msg) = @_;
1470 1729
1471 $self->ns->ext_event ($type, %msg); 1730 $self->ns->ext_msg ($type, @msg);
1472} 1731}
1473 1732
1474=head3 cf::region 1733=head3 cf::region
1475 1734
1476=over 4 1735=over 4
1520our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1522 1781
1523sub generate_random_map { 1782sub generate_random_map {
1524 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1525 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1788 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1619 $self->init; # pass $1 etc. 1881 $self->init; # pass $1 etc.
1620 return $self; 1882 return $self;
1621 } 1883 }
1622 } 1884 }
1623 1885
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1886 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1887 ()
1626} 1888}
1627 1889
1628sub init { 1890sub init {
1629 my ($self) = @_; 1891 my ($self) = @_;
1651 1913
1652# the temporary/swap location 1914# the temporary/swap location
1653sub save_path { 1915sub save_path {
1654 my ($self) = @_; 1916 my ($self) = @_;
1655 1917
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1658} 1920}
1659 1921
1660# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1661sub uniq_path { 1923sub uniq_path {
1662 my ($self) = @_; 1924 my ($self) = @_;
1663 1925
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1666} 1928}
1667 1929
1668# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1669# all maps in C++... 1931# all maps in C++...
1692 1954
1693sub load_header_from($) { 1955sub load_header_from($) {
1694 my ($self, $path) = @_; 1956 my ($self, $path) = @_;
1695 1957
1696 utf8::encode $path; 1958 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1959 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1960 or return;
1961
1962 $self->_load_header ($f)
1963 or return;
1964
1965 local $MAP_LOADING{$self->{path}} = $self;
1966 $f->resolve_delayed_derefs;
1702 1967
1703 $self->{load_path} = $path; 1968 $self->{load_path} = $path;
1704 1969
1705 1 1970 1
1706} 1971}
1760sub find { 2025sub find {
1761 my ($path, $origin) = @_; 2026 my ($path, $origin) = @_;
1762 2027
1763 $path = normalise $path, $origin && $origin->path; 2028 $path = normalise $path, $origin && $origin->path;
1764 2029
2030 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2031 cf::lock_wait "map_find:$path";
1766 2032
1767 $cf::MAP{$path} || do { 2033 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path"; 2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
1769 my $map = new_from_path cf::map $path 2037 my $map = new_from_path cf::map $path
1770 or return; 2038 or return;
1771 2039
1772 $map->{last_save} = $cf::RUNTIME; 2040 $map->{last_save} = $cf::RUNTIME;
1773 2041
1775 or return; 2043 or return;
1776 2044
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2046 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2047 #$cf::WAIT_FOR_TICK->wait;
2048 undef $guard1;
2049 undef $guard2;
1780 $map->reset; 2050 $map->reset;
1781 undef $guard;
1782 return find $path; 2051 return find $path;
1783 } 2052 }
1784 2053
1785 $cf::MAP{$path} = $map 2054 $cf::MAP{$path} = $map
1786 } 2055 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2064 local $self->{deny_reset} = 1; # loading can take a long time
1796 2065
1797 my $path = $self->{path}; 2066 my $path = $self->{path};
1798 2067
1799 { 2068 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2069 my $guard = cf::lock_acquire "map_data:$path";
1801 2070
2071 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2072 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2073
1804 $self->in_memory (cf::MAP_LOADING); 2074 $self->in_memory (cf::MAP_LOADING);
1805 2075
1806 $self->alloc; 2076 $self->alloc;
1807 2077
1808 $self->pre_load; 2078 $self->pre_load;
1809 Coro::cede; 2079 cf::cede_to_tick;
1810 2080
2081 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2083 $self->_load_objects ($f)
1812 or return; 2084 or return;
1813 2085
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2087 if delete $self->{load_original};
1816 2088
1817 if (my $uniq = $self->uniq_path) { 2089 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2090 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2091 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2093 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2094 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs;
2096 }
1822 } 2097 }
1823 } 2098 }
1824 2099
1825 Coro::cede; 2100 $f->resolve_delayed_derefs;
2101
2102 cf::cede_to_tick;
1826 # now do the right thing for maps 2103 # now do the right thing for maps
1827 $self->link_multipart_objects; 2104 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2105 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2106 unless $self->difficulty;
1830 Coro::cede; 2107 cf::cede_to_tick;
1831 2108
1832 unless ($self->{deny_activate}) { 2109 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2110 $self->decay_objects;
1834 $self->fix_auto_apply; 2111 $self->fix_auto_apply;
1835 $self->update_buttons; 2112 $self->update_buttons;
1836 Coro::cede; 2113 cf::cede_to_tick;
1837 $self->set_darkness_map; 2114 $self->set_darkness_map;
1838 Coro::cede; 2115 cf::cede_to_tick;
1839 $self->activate; 2116 $self->activate;
1840 } 2117 }
1841 2118
2119 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME);
2121
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2123 }
1844 2124
1845 $self->post_load; 2125 $self->post_load;
1846} 2126}
1847 2127
1856 2136
1857 $self 2137 $self
1858} 2138}
1859 2139
1860# find and load all maps in the 3x3 area around a map 2140# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2141sub load_neighbours {
1862 my ($map) = @_; 2142 my ($map) = @_;
1863 2143
1864 my @diag; # diagonal neighbours 2144 my @neigh; # diagonal neighbours
1865 2145
1866 for (0 .. 3) { 2146 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2147 my $neigh = $map->tile_path ($_)
1868 or next; 2148 or next;
1869 $neigh = find $neigh, $map 2149 $neigh = find $neigh, $map
1870 or next; 2150 or next;
1871 $neigh->load; 2151 $neigh->load;
1872 2152
2153 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2156 }
1876 2157
1877 for (@diag) { 2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2160 my $neigh = find $path, $origin
1879 or next; 2161 or next;
1880 $neigh->load; 2162 $neigh->load;
1881 } 2163 }
1882} 2164}
1883 2165
1888} 2170}
1889 2171
1890sub do_load_sync { 2172sub do_load_sync {
1891 my ($map) = @_; 2173 my ($map) = @_;
1892 2174
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main;
2177
1893 cf::sync_job { $map->load }; 2178 cf::sync_job { $map->load };
1894} 2179}
1895 2180
1896our %MAP_PREFETCH; 2181our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2182our $MAP_PREFETCHER = undef;
1898 2183
1899sub find_async { 2184sub find_async {
1900 my ($path, $origin) = @_; 2185 my ($path, $origin, $load) = @_;
1901 2186
1902 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
1903 2188
1904 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2191 }
1907 2192
1908 undef $MAP_PREFETCH{$path}; 2193 $MAP_PREFETCH{$path} |= $load;
2194
1909 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
1910 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2200 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2201 $map->load if $v;
2202 }
1915 2203
1916 delete $MAP_PREFETCH{$path}; 2204 delete $MAP_PREFETCH{$k};
1917 } 2205 }
1918 } 2206 }
1919 undef $MAP_PREFETCHER; 2207 undef $MAP_PREFETCHER;
1920 }; 2208 };
1921 $MAP_PREFETCHER->prio (6); 2209 $MAP_PREFETCHER->prio (6);
1924} 2212}
1925 2213
1926sub save { 2214sub save {
1927 my ($self) = @_; 2215 my ($self) = @_;
1928 2216
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2218
1931 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
1932 2220
1933 return unless $self->dirty; 2221 return unless $self->dirty;
1934 2222
1940 return if $self->{deny_save}; 2228 return if $self->{deny_save};
1941 2229
1942 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
1943 2231
1944 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
1946 }; 2235 };
2236
2237 cf::get_slot 0.02;
1947 2238
1948 if ($uniq) { 2239 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2242 } else {
1957 my ($self) = @_; 2248 my ($self) = @_;
1958 2249
1959 # save first because save cedes 2250 # save first because save cedes
1960 $self->save; 2251 $self->save;
1961 2252
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2254
1964 return if $self->players; 2255 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2257 return if $self->{deny_save};
1967 2258
2259 $self->in_memory (cf::MAP_SWAPPED);
2260
2261 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2263 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2264}
1971 2265
1972sub reset_at { 2266sub reset_at {
1973 my ($self) = @_; 2267 my ($self) = @_;
1974 2268
2006 if $uniq; 2300 if $uniq;
2007 } 2301 }
2008 2302
2009 delete $cf::MAP{$self->path}; 2303 delete $cf::MAP{$self->path};
2010 2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2307 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2308
2015 $self->unlink_save; 2309 $self->unlink_save;
2016 $self->destroy; 2310 $self->destroy;
2017} 2311}
2018 2312
2019my $nuke_counter = "aaaa"; 2313my $nuke_counter = "aaaa";
2020 2314
2021sub nuke { 2315sub nuke {
2022 my ($self) = @_; 2316 my ($self) = @_;
2023 2317
2318 {
2319 my $lock = cf::lock_acquire "map_data:$self->{path}";
2320
2024 delete $cf::MAP{$self->path}; 2321 delete $cf::MAP{$self->path};
2025 2322
2026 $self->unlink_save; 2323 $self->unlink_save;
2027 2324
2028 bless $self, "cf::map"; 2325 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2326 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2327 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2328 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2330
2034 $cf::MAP{$self->path} = $self; 2331 $cf::MAP{$self->path} = $self;
2332 }
2035 2333
2036 $self->reset; # polite request, might not happen 2334 $self->reset; # polite request, might not happen
2037} 2335}
2038 2336
2039=item $maps = cf::map::tmp_maps 2337=item $maps = cf::map::tmp_maps
2081 2379
2082sub unique_maps() { 2380sub unique_maps() {
2083 [ 2381 [
2084 map { 2382 map {
2085 utf8::decode $_; 2383 utf8::decode $_;
2086 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2087 ? normalise $_ 2387 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2389 ]
2091} 2390}
2092 2391
2093package cf;
2094
2095=back 2392=back
2096 2393
2097=head3 cf::object 2394=head3 cf::object
2098 2395
2099=cut 2396=cut
2102 2399
2103=over 4 2400=over 4
2104 2401
2105=item $ob->inv_recursive 2402=item $ob->inv_recursive
2106 2403
2107Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2108 2406
2109=cut 2407=cut
2110 2408
2111sub inv_recursive_; 2409sub inv_recursive_;
2112sub inv_recursive_ { 2410sub inv_recursive_ {
2113 map { $_, inv_recursive_ $_->inv } @_ 2411 map { $_, inv_recursive_ $_->inv } @_
2114} 2412}
2115 2413
2116sub inv_recursive { 2414sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2416}
2417
2418=item $ref = $ob->ref
2419
2420Creates and returns a persistent reference to an object that can be stored as a string.
2421
2422=item $ob = cf::object::deref ($refstring)
2423
2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2425even if the object actually exists. May block.
2426
2427=cut
2428
2429sub deref {
2430 my ($ref) = @_;
2431
2432 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2433 my ($uuid, $name) = ($1, $2);
2434 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2435 or return;
2436 $pl->ob->uuid eq $uuid
2437 or return;
2438
2439 $pl->ob
2440 } else {
2441 warn "$ref: cannot resolve object reference\n";
2442 undef
2443 }
2118} 2444}
2119 2445
2120package cf; 2446package cf;
2121 2447
2122=back 2448=back
2146 2472
2147 } else { 2473 } else {
2148 my $pl = $self->contr; 2474 my $pl = $self->contr;
2149 2475
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2476 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2479
2159 } else { 2480 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2482 $self->message ($msg, $flags);
2162 } 2483 }
2163 } 2484 }
2485}
2486
2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2488
2489=cut
2490
2491sub cf::object::send_msg {
2492 my $pl = shift->contr
2493 or return;
2494 $pl->send_msg (@_);
2164} 2495}
2165 2496
2166=item $player_object->may ("access") 2497=item $player_object->may ("access")
2167 2498
2168Returns wether the given player is authorized to access resource "access" 2499Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2578 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2579 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2580 if $x <=0 && $y <= 0;
2250 2581
2251 $map->load; 2582 $map->load;
2252 $map->load_diag; 2583 $map->load_neighbours;
2253 2584
2254 return unless $self->contr->active; 2585 return unless $self->contr->active;
2255 $self->activate_recursive; 2586 $self->activate_recursive;
2256 2587
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2589 $self->enter_map ($map, $x, $y);
2259} 2590}
2260 2591
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2593
2263Moves the player to the given map-path and coordinates by first freezing 2594Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2595her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2596that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2597the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process.
2267 2599
2268=cut 2600=cut
2269 2601
2270our $GOTOGEN; 2602our $GOTOGEN;
2271 2603
2272sub cf::object::player::goto { 2604sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2605 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2606
2275 # do generation counting so two concurrent goto's will be executed in-order 2607 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2609
2278 $self->enter_link; 2610 $self->enter_link;
2279 2611
2280 (async { 2612 (async {
2613 $Coro::current->{desc} = "player::goto $path $x $y";
2614
2615 # *tag paths override both path and x|y
2616 if ($path =~ /^\*(.*)$/) {
2617 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2618 my $ob = $obs[rand @obs];
2619
2620 # see if we actually can go there
2621 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2622 $ob = $obs[rand @obs];
2623 } else {
2624 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2625 }
2626 # else put us there anyways for now #d#
2627
2628 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2629 } else {
2630 ($path, $x, $y) = (undef, undef, undef);
2631 }
2632 }
2633
2281 my $map = eval { 2634 my $map = eval {
2282 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2283 2636
2284 if ($map) { 2637 if ($map) {
2285 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2287 } else { 2640 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2642 }
2290 2643
2291 $map 2644 $map
2292 }; 2645 };
2293 2646
2298 2651
2299 if ($gen == $self->{_goto_generation}) { 2652 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2653 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2654 $self->leave_link ($map, $x, $y);
2302 } 2655 }
2656
2657 $done->() if $done;
2303 })->prio (1); 2658 })->prio (1);
2304} 2659}
2305 2660
2306=item $player_object->enter_exit ($exit_object) 2661=item $player_object->enter_exit ($exit_object)
2307 2662
2344 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2345 } 2700 }
2346 2701
2347 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2348 2703
2349 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2352 2707
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2381 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2384 2739
2385 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2386 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2387 unless (eval { 2744 unless (eval {
2388 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2389 2746
2390 1; 2747 1;
2416 2773
2417 utf8::encode $text; 2774 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2776}
2420 2777
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2778=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2779
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2780Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2781client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2782the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2427 2784
2428=cut 2785=cut
2429 2786
2787# non-persistent channels (usually the info channel)
2788our %CHANNEL = (
2789 "c/identify" => {
2790 id => "infobox",
2791 title => "Identify",
2792 reply => undef,
2793 tooltip => "Items recently identified",
2794 },
2795 "c/examine" => {
2796 id => "infobox",
2797 title => "Examine",
2798 reply => undef,
2799 tooltip => "Signs and other items you examined",
2800 },
2801 "c/book" => {
2802 id => "infobox",
2803 title => "Book",
2804 reply => undef,
2805 tooltip => "The contents of a note or book",
2806 },
2807 "c/lookat" => {
2808 id => "infobox",
2809 title => "Look",
2810 reply => undef,
2811 tooltip => "What you saw there",
2812 },
2813 "c/who" => {
2814 id => "infobox",
2815 title => "Players",
2816 reply => undef,
2817 tooltip => "Shows players who are currently online",
2818 },
2819 "c/body" => {
2820 id => "infobox",
2821 title => "Body Parts",
2822 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available",
2824 },
2825 "c/uptime" => {
2826 id => "infobox",
2827 title => "Uptime",
2828 reply => undef,
2829 tooltip => "How long the server has been running since last restart",
2830 },
2831 "c/mapinfo" => {
2832 id => "infobox",
2833 title => "Map Info",
2834 reply => undef,
2835 tooltip => "Information related to the maps",
2836 },
2837);
2838
2430sub cf::client::send_msg { 2839sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2841
2433 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg);
2434 2843
2844 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845
2846 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel};
2849
2850 $self->ext_msg (channel_info => $channel)
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id};
2854
2855 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel)
2860 if $self->can_msg;
2861 }
2862
2863 $channel = $channel->{id};
2864 }
2865
2435 return unless @extra || length $msg; 2866 return unless @extra || length $msg;
2436 2867
2437 if ($self->can_msg) { 2868 if ($self->can_msg) {
2869 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF;
2872
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2873 $self->send_packet ("msg " . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2875 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886
2887 $color &= cf::NDI_COLOR_MASK;
2888
2889 utf8::encode $msg;
2890
2451 if (0 && $msg =~ /\[/) { 2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2894 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2896 $self->send_packet ("drawinfo $color $msg")
2456 } 2897 }
2457 } 2898 }
2458 } 2899 }
2459} 2900}
2460 2901
2461=item $client->ext_event ($type, %msg) 2902=item $client->ext_msg ($type, @msg)
2462 2903
2463Sends an ext event to the client. 2904Sends an ext event to the client.
2464 2905
2465=cut 2906=cut
2466 2907
2467sub cf::client::ext_event($$%) { 2908sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2909 my ($self, $type, @msg) = @_;
2469 2910
2911 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2914 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 }
2917}
2918
2919=item $client->ext_reply ($msgid, @msg)
2920
2921Sends an ext reply to the client.
2922
2923=cut
2924
2925sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_;
2927
2928 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2472} 2935}
2473 2936
2474=item $success = $client->query ($flags, "text", \&cb) 2937=item $success = $client->query ($flags, "text", \&cb)
2475 2938
2476Queues a query to the client, calling the given callback with 2939Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 2994 my ($ns, $buf) = @_;
2532 2995
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2996 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2997
2535 if (ref $msg) { 2998 if (ref $msg) {
2999 my ($type, $reply, @payload) =
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003
3004 my @reply;
3005
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3006 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 3007 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 3008 }
3009
3010 $ns->ext_reply ($reply, @reply)
3011 if $reply;
3012
2542 } else { 3013 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 3015 }
2545 3016
2546 cf::override; 3017 cf::override;
2593our $safe = new Safe "safe"; 3064our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3065our $safe_hole = new Safe::Hole;
2595 3066
2596$SIG{FPE} = 'IGNORE'; 3067$SIG{FPE} = 'IGNORE';
2597 3068
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3069$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math
3071 grepstart grepwhile mapstart mapwhile
3072 sort time
3073));
2599 3074
2600# here we export the classes and methods available to script code 3075# here we export the classes and methods available to script code
2601 3076
2602=pod 3077=pod
2603 3078
2604The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
2605 3080
2606 cf::object 3081 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3082 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3083 insert remove name archname title slaying race decrease split
2609 3084
2610 cf::object::player 3085 cf::object::player
2611 player 3086 player
2612 3087
2613 cf::player 3088 cf::player
2618 3093
2619=cut 3094=cut
2620 3095
2621for ( 3096for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 3098 insert remove inv name archname title slaying race
3099 decrease split destroy)],
2624 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2627) { 3103) {
2628 no strict 'refs'; 3104 no strict 'refs';
2704# the server's init and main functions 3180# the server's init and main functions
2705 3181
2706sub load_facedata($) { 3182sub load_facedata($) {
2707 my ($path) = @_; 3183 my ($path) = @_;
2708 3184
3185 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = ();
3188
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190
2709 warn "loading facedata from $path\n"; 3191 warn "loading facedata from $path\n";
2710 3192
2711 my $facedata; 3193 my $facedata;
2712 0 < aio_load $path, $facedata 3194 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3195 or die "$path: $!";
2715 $facedata = Coro::Storable::thaw $facedata; 3197 $facedata = Coro::Storable::thaw $facedata;
2716 3198
2717 $facedata->{version} == 2 3199 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3200 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3201
3202 # patch in the exptable
3203 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3206 };
3207 cf::cede_to_tick;
3208
2720 { 3209 {
2721 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
2722 3211
2723 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
2725 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
2726 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
2727 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2728 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2729 3219
2730 cf::cede_to_tick; 3220 cf::cede_to_tick;
2731 } 3221 }
2732 3222
2733 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
2734 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
2735 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
2736 or next; 3227 or next;
3228
2737 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
2738 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
2739 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2740 } else { 3232 } else {
2741 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
2758 3250
2759 { 3251 {
2760 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
2761 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
2762 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
2763 my $enc = JSON::XS->new->utf8->canonical;
2764 3255
2765 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({ 3257 if (defined $info->{type}) {
2767 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO#
2770 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260
3261 if ($info->{type} & 1) {
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2775 cf::face::set_type $idx, 1; 3275 cf::face::set_type $idx, $info->{type};
2776 cf::face::set_data $idx, 0, $data, $chk; 3276 } else {
3277 $RESOURCE{$name} = $info;
3278 }
2777 3279
2778 cf::cede_to_tick; 3280 cf::cede_to_tick;
2779 } 3281 }
2780 } 3282 }
2781 3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285
2782 1 3286 1
2783} 3287}
2784 3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308
3309register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_;
3311
3312 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v);
3314 }
3315};
3316
3317sub load_resource_file($) {
3318 my $guard = lock_acquire "load_resource_file";
3319
3320 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100;
3322 cf::arch::commit_load;
3323
3324 $status
3325}
3326
2785sub reload_regions { 3327sub reload_regions {
3328 # HACK to clear player env face cache, we need some signal framework
3329 # for this (global event?)
3330 %ext::player_env::MUSIC_FACE_CACHE = ();
3331
2786 load_resource_file "$MAPDIR/regions" 3332 load_resource_file "$MAPDIR/regions"
2787 or die "unable to load regions file\n"; 3333 or die "unable to load regions file\n";
2788 3334
2789 for (cf::region::list) { 3335 for (cf::region::list) {
2790 $_->{match} = qr/$_->{match}/ 3336 $_->{match} = qr/$_->{match}/
2798} 3344}
2799 3345
2800sub reload_archetypes { 3346sub reload_archetypes {
2801 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
2802 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
2803 #d# NEED to laod twice to resolve forward references
2804 # this really needs to be done in an extra post-pass
2805 # (which needs to be synchronous, so solve it differently)
2806 load_resource_file "$DATADIR/archetypes"
2807 or die "unable to load archetypes\n";
2808} 3349}
2809 3350
2810sub reload_treasures { 3351sub reload_treasures {
2811 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
2812 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
2813} 3354}
2814 3355
2815sub reload_resources { 3356sub reload_resources {
2816 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
2817 3358
3359 reload_facedata;
3360 reload_archetypes;
2818 reload_regions; 3361 reload_regions;
2819 reload_facedata;
2820 #reload_archetypes;#d#
2821 reload_archetypes;
2822 reload_treasures; 3362 reload_treasures;
2823 3363
2824 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
2825} 3365}
2826 3366
2827sub init { 3367sub init {
3368 my $guard = freeze_mainloop;
3369
2828 reload_resources; 3370 reload_resources;
2829} 3371}
2830 3372
2831sub cfg_load { 3373sub reload_config {
2832 open my $fh, "<:utf8", "$CONFDIR/config" 3374 open my $fh, "<:utf8", "$CONFDIR/config"
2833 or return; 3375 or return;
2834 3376
2835 local $/; 3377 local $/;
2836 *CFG = YAML::Syck::Load <$fh>; 3378 *CFG = YAML::Load <$fh>;
2837 3379
2838 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2839 3381
2840 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3382 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2841 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3383 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2852sub main { 3394sub main {
2853 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
2854 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
2855 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2856 (async { 3398 (async {
2857 Event::one_event; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT;
2858 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
2859 }; 3402 };
2860 3403
2861 cfg_load; 3404 {
3405 my $guard = freeze_mainloop;
3406 reload_config;
2862 db_init; 3407 db_init;
2863 load_extensions; 3408 load_extensions;
2864 3409
2865 $TICK_WATCHER->start; 3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3411 evthread_start IO::AIO::poll_fileno;
3412 }
3413
2866 Event::loop; 3414 EV::loop;
2867} 3415}
2868 3416
2869############################################################################# 3417#############################################################################
2870# initialisation and cleanup 3418# initialisation and cleanup
2871 3419
2872# install some emergency cleanup handlers 3420# install some emergency cleanup handlers
2873BEGIN { 3421BEGIN {
3422 our %SIGWATCHER = ();
2874 for my $signal (qw(INT HUP TERM)) { 3423 for my $signal (qw(INT HUP TERM)) {
2875 Event->signal ( 3424 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2876 reentrant => 0,
2877 data => WF_AUTOCANCEL,
2878 signal => $signal,
2879 prio => 0,
2880 cb => sub {
2881 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
2882 },
2883 ); 3426 };
2884 } 3427 }
2885} 3428}
2886 3429
2887sub write_runtime { 3430sub write_runtime_sync {
2888 my $runtime = "$LOCALDIR/runtime"; 3431 my $runtime = "$LOCALDIR/runtime";
2889 3432
2890 # first touch the runtime file to show we are still running: 3433 # first touch the runtime file to show we are still running:
2891 # the fsync below can take a very very long time. 3434 # the fsync below can take a very very long time.
2892 3435
2918 and return; 3461 and return;
2919 3462
2920 warn "runtime file written.\n"; 3463 warn "runtime file written.\n";
2921 3464
2922 1 3465 1
3466}
3467
3468our $uuid_lock;
3469our $uuid_skip;
3470
3471sub write_uuid_sync($) {
3472 $uuid_skip ||= $_[0];
3473
3474 return if $uuid_lock;
3475 local $uuid_lock = 1;
3476
3477 my $uuid = "$LOCALDIR/uuid";
3478
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return;
3481
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3483 $uuid_skip = 0;
3484
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return;
3487
3488 # always fsync - this file is important
3489 aio_fsync $fh
3490 and return;
3491
3492 close $fh
3493 or return;
3494
3495 aio_rename "$uuid~", $uuid
3496 and return;
3497
3498 warn "uuid file written ($value).\n";
3499
3500 1
3501
3502}
3503
3504sub write_uuid($$) {
3505 my ($skip, $sync) = @_;
3506
3507 $sync ? write_uuid_sync $skip
3508 : async { write_uuid_sync $skip };
2923} 3509}
2924 3510
2925sub emergency_save() { 3511sub emergency_save() {
2926 my $freeze_guard = cf::freeze_mainloop; 3512 my $freeze_guard = cf::freeze_mainloop;
2927 3513
2933 # and maps saved/destroyed asynchronously. 3519 # and maps saved/destroyed asynchronously.
2934 warn "begin emergency player save\n"; 3520 warn "begin emergency player save\n";
2935 for my $login (keys %cf::PLAYER) { 3521 for my $login (keys %cf::PLAYER) {
2936 my $pl = $cf::PLAYER{$login} or next; 3522 my $pl = $cf::PLAYER{$login} or next;
2937 $pl->valid or next; 3523 $pl->valid or next;
3524 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2938 $pl->save; 3525 $pl->save;
2939 } 3526 }
2940 warn "end emergency player save\n"; 3527 warn "end emergency player save\n";
2941 3528
2942 warn "begin emergency map save\n"; 3529 warn "begin emergency map save\n";
2948 warn "end emergency map save\n"; 3535 warn "end emergency map save\n";
2949 3536
2950 warn "begin emergency database checkpoint\n"; 3537 warn "begin emergency database checkpoint\n";
2951 BDB::db_env_txn_checkpoint $DB_ENV; 3538 BDB::db_env_txn_checkpoint $DB_ENV;
2952 warn "end emergency database checkpoint\n"; 3539 warn "end emergency database checkpoint\n";
3540
3541 warn "begin write uuid\n";
3542 write_uuid_sync 1;
3543 warn "end write uuid\n";
2953 }; 3544 };
2954 3545
2955 warn "leave emergency perl save\n"; 3546 warn "leave emergency perl save\n";
2956} 3547}
2957 3548
2972 warn "reloading..."; 3563 warn "reloading...";
2973 3564
2974 warn "entering sync_job"; 3565 warn "entering sync_job";
2975 3566
2976 cf::sync_job { 3567 cf::sync_job {
2977 cf::write_runtime; # external watchdog should not bark 3568 cf::write_runtime_sync; # external watchdog should not bark
2978 cf::emergency_save; 3569 cf::emergency_save;
2979 cf::write_runtime; # external watchdog should not bark 3570 cf::write_runtime_sync; # external watchdog should not bark
2980 3571
2981 warn "syncing database to disk"; 3572 warn "syncing database to disk";
2982 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
2983 3574
2984 # if anything goes wrong in here, we should simply crash as we already saved 3575 # if anything goes wrong in here, we should simply crash as we already saved
2985
2986 warn "cancelling all WF_AUTOCANCEL watchers";
2987 for (Event::all_watchers) {
2988 $_->cancel if $_->data & WF_AUTOCANCEL;
2989 }
2990 3576
2991 warn "flushing outstanding aio requests"; 3577 warn "flushing outstanding aio requests";
2992 for (;;) { 3578 for (;;) {
2993 BDB::flush; 3579 BDB::flush;
2994 IO::AIO::flush; 3580 IO::AIO::flush;
2995 Coro::cede; 3581 Coro::cede_notself;
2996 last unless IO::AIO::nreqs || BDB::nreqs; 3582 last unless IO::AIO::nreqs || BDB::nreqs;
2997 warn "iterate..."; 3583 warn "iterate...";
2998 } 3584 }
2999 3585
3000 ++$RELOAD; 3586 ++$RELOAD;
3059 warn "reloading cf.pm"; 3645 warn "reloading cf.pm";
3060 require cf; 3646 require cf;
3061 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3062 3648
3063 warn "loading config and database again"; 3649 warn "loading config and database again";
3064 cf::cfg_load; 3650 cf::reload_config;
3065 3651
3066 warn "loading extensions"; 3652 warn "loading extensions";
3067 cf::load_extensions; 3653 cf::load_extensions;
3068 3654
3069 warn "reattaching attachments to objects/players"; 3655 warn "reattaching attachments to objects/players";
3076 warn "leaving sync_job"; 3662 warn "leaving sync_job";
3077 3663
3078 1 3664 1
3079 } or do { 3665 } or do {
3080 warn $@; 3666 warn $@;
3081 warn "error while reloading, exiting."; 3667 cf::cleanup "error while reloading, exiting.";
3082 exit 1;
3083 }; 3668 };
3084 3669
3085 warn "reloaded"; 3670 warn "reloaded";
3086}; 3671};
3087 3672
3089 3674
3090sub reload_perl() { 3675sub reload_perl() {
3091 # doing reload synchronously and two reloads happen back-to-back, 3676 # doing reload synchronously and two reloads happen back-to-back,
3092 # coro crashes during coro_state_free->destroy here. 3677 # coro crashes during coro_state_free->destroy here.
3093 3678
3094 $RELOAD_WATCHER ||= Event->timer ( 3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3095 reentrant => 0,
3096 after => 0,
3097 data => WF_AUTOCANCEL,
3098 cb => sub {
3099 do_reload_perl; 3680 do_reload_perl;
3100 undef $RELOAD_WATCHER; 3681 undef $RELOAD_WATCHER;
3101 },
3102 ); 3682 };
3103} 3683}
3104 3684
3105register_command "reload" => sub { 3685register_command "reload" => sub {
3106 my ($who, $arg) = @_; 3686 my ($who, $arg) = @_;
3107 3687
3108 if ($who->flag (FLAG_WIZ)) { 3688 if ($who->flag (FLAG_WIZ)) {
3109 $who->message ("reloading server."); 3689 $who->message ("reloading server.");
3690 async {
3691 $Coro::current->{desc} = "perl_reload";
3110 async { reload_perl }; 3692 reload_perl;
3693 };
3111 } 3694 }
3112}; 3695};
3113 3696
3114unshift @INC, $LIBDIR; 3697unshift @INC, $LIBDIR;
3115 3698
3117 3700
3118our @WAIT_FOR_TICK; 3701our @WAIT_FOR_TICK;
3119our @WAIT_FOR_TICK_BEGIN; 3702our @WAIT_FOR_TICK_BEGIN;
3120 3703
3121sub wait_for_tick { 3704sub wait_for_tick {
3122 return unless $TICK_WATCHER->is_active;
3123 return if $Coro::current == $Coro::main; 3705 return if tick_inhibit || $Coro::current == $Coro::main;
3124 3706
3125 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3126 push @WAIT_FOR_TICK, $signal; 3708 push @WAIT_FOR_TICK, $signal;
3127 $signal->wait; 3709 $signal->wait;
3128} 3710}
3129 3711
3130sub wait_for_tick_begin { 3712sub wait_for_tick_begin {
3131 return unless $TICK_WATCHER->is_active;
3132 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3133 3714
3134 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3135 push @WAIT_FOR_TICK_BEGIN, $signal; 3716 push @WAIT_FOR_TICK_BEGIN, $signal;
3136 $signal->wait; 3717 $signal->wait;
3137} 3718}
3138 3719
3139 my $min = 1e6;#d# 3720sub tick {
3140 my $avg = 10;
3141$TICK_WATCHER = Event->timer (
3142 reentrant => 0,
3143 parked => 1,
3144 prio => 0,
3145 at => $NEXT_TICK || $TICK,
3146 data => WF_AUTOCANCEL,
3147 cb => sub {
3148 if ($Coro::current != $Coro::main) { 3721 if ($Coro::current != $Coro::main) {
3149 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3722 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3150 unless ++$bug_warning > 10; 3723 unless ++$bug_warning > 10;
3151 return; 3724 return;
3152 } 3725 }
3153 3726
3154 $NOW = $tick_start = Event::time;
3155
3156 cf::server_tick; # one server iteration 3727 cf::server_tick; # one server iteration
3157 3728
3158 0 && sync_job {#d# 3729 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3159 for(1..10) { 3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3160 my $t = Event::time; 3731 Coro::async_pool {
3161 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3732 $Coro::current->{desc} = "runtime saver";
3162 or die; 3733 write_runtime_sync
3163 3734 or warn "ERROR: unable to write runtime file: $!";
3164 $map->width (50);
3165 $map->height (50);
3166 $map->alloc;
3167 $map->_load_objects ("/tmp/x.map", 1);
3168 my $t = Event::time - $t;
3169
3170 #next unless $t < 0.0013;#d#
3171 if ($t < $min) {
3172 $min = $t;
3173 }
3174 $avg = $avg * 0.99 + $t * 0.01;
3175 }
3176 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3177 exit 0;
3178 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3179 }; 3735 };
3736 }
3180 3737
3181 $RUNTIME += $TICK;
3182 $NEXT_TICK += $TICK;
3183
3184 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3185 $NEXT_RUNTIME_WRITE = $NOW + 10;
3186 Coro::async_pool {
3187 write_runtime
3188 or warn "ERROR: unable to write runtime file: $!";
3189 };
3190 }
3191
3192# my $AFTER = Event::time;
3193# warn $AFTER - $NOW;#d#
3194
3195 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3196 $sig->send; 3739 $sig->send;
3197 } 3740 }
3198 while (my $sig = shift @WAIT_FOR_TICK) { 3741 while (my $sig = shift @WAIT_FOR_TICK) {
3199 $sig->send; 3742 $sig->send;
3200 } 3743 }
3201 3744
3202 $NOW = Event::time; 3745 $LOAD = ($NOW - $TICK_START) / $TICK;
3203
3204 # if we are delayed by four ticks or more, skip them all
3205 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3206
3207 $TICK_WATCHER->at ($NEXT_TICK);
3208 $TICK_WATCHER->start;
3209
3210 $LOAD = ($NOW - $tick_start) / $TICK;
3211 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3212 3747
3213 _post_tick; 3748 if (0) {
3214 3749 if ($NEXT_TICK) {
3215 3750 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d#
3753 }
3216 }, 3754 }
3217); 3755}
3218 3756
3219{ 3757{
3220 BDB::max_poll_time $TICK * 0.1; 3758 # configure BDB
3221 $BDB_POLL_WATCHER = Event->io ( 3759
3222 reentrant => 0,
3223 fd => BDB::poll_fileno,
3224 poll => 'r',
3225 prio => 0,
3226 data => WF_AUTOCANCEL,
3227 cb => \&BDB::poll_cb,
3228 );
3229 BDB::min_parallel 8; 3760 BDB::min_parallel 8;
3230 3761 BDB::max_poll_reqs $TICK * 0.1;
3231 BDB::set_sync_prepare { 3762 $Coro::BDB::WATCHER->priority (1);
3232 my $status;
3233 my $current = $Coro::current;
3234 (
3235 sub {
3236 $status = $!;
3237 $current->ready; undef $current;
3238 },
3239 sub {
3240 Coro::schedule while defined $current;
3241 $! = $status;
3242 },
3243 )
3244 };
3245 3763
3246 unless ($DB_ENV) { 3764 unless ($DB_ENV) {
3247 $DB_ENV = BDB::db_env_create; 3765 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3767 | BDB::LOG_AUTOREMOVE, 1);
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3248 3770
3249 cf::sync_job { 3771 cf::sync_job {
3250 eval { 3772 eval {
3251 BDB::db_env_open 3773 BDB::db_env_open
3252 $DB_ENV, 3774 $DB_ENV,
3254 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3776 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3255 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3777 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3256 0666; 3778 0666;
3257 3779
3258 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3780 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3259
3260 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3261 $DB_ENV->set_lk_detect;
3262 }; 3781 };
3263 3782
3264 cf::cleanup "db_env_open(db): $@" if $@; 3783 cf::cleanup "db_env_open(db): $@" if $@;
3265 }; 3784 };
3266 } 3785 }
3786
3787 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3788 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3789 };
3790 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3791 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3792 };
3793 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3794 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3795 };
3267} 3796}
3268 3797
3269{ 3798{
3799 # configure IO::AIO
3800
3270 IO::AIO::min_parallel 8; 3801 IO::AIO::min_parallel 8;
3271
3272 undef $Coro::AIO::WATCHER;
3273 IO::AIO::max_poll_time $TICK * 0.1; 3802 IO::AIO::max_poll_time $TICK * 0.1;
3274 $AIO_POLL_WATCHER = Event->io ( 3803 $Coro::AIO::WATCHER->priority (1);
3275 reentrant => 0,
3276 data => WF_AUTOCANCEL,
3277 fd => IO::AIO::poll_fileno,
3278 poll => 'r',
3279 prio => 6,
3280 cb => \&IO::AIO::poll_cb,
3281 );
3282} 3804}
3283 3805
3284my $_log_backtrace; 3806my $_log_backtrace;
3285 3807
3286sub _log_backtrace { 3808sub _log_backtrace {
3290 3812
3291 # limit the # of concurrent backtraces 3813 # limit the # of concurrent backtraces
3292 if ($_log_backtrace < 2) { 3814 if ($_log_backtrace < 2) {
3293 ++$_log_backtrace; 3815 ++$_log_backtrace;
3294 async { 3816 async {
3817 $Coro::current->{desc} = "abt $msg";
3818
3295 my @bt = fork_call { 3819 my @bt = fork_call {
3296 @addr = map { sprintf "%x", $_ } @addr; 3820 @addr = map { sprintf "%x", $_ } @addr;
3297 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3821 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3298 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3822 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3299 or die "addr2line: $!"; 3823 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines