ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.414 by root, Thu Apr 10 09:10:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
34 58
35# configure various modules to our taste 59# configure various modules to our taste
36# 60#
37$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 104our $DB_ENV;
84 105
85our %CFG; 106our %CFG;
86 107
87our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 109our $RUNTIME;
110our $NOW;
89 111
90our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
93 115
94# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 118
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
100 123
101binmode STDOUT; 124binmode STDOUT;
102binmode STDERR; 125binmode STDERR;
103 126
104# read virtual server time, if available 127# read virtual server time, if available
157 180
158The raw value load value from the last tick. 181The raw value load value from the last tick.
159 182
160=item %cf::CFG 183=item %cf::CFG
161 184
162Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 186from wherever your confdir points to.
164 187
165=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
166 189
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
171=back 200=back
172 201
173=cut 202=cut
174 203
175BEGIN { 204BEGIN {
179 $msg .= "\n" 208 $msg .= "\n"
180 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
181 210
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 212
184 utf8::encode $msg;
185 LOG llevError, $msg; 213 LOG llevError, $msg;
186 }; 214 };
187} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
188 231
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 248)) {
206 no strict 'refs'; 249 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 251}
209 252
210$Event::DIED = sub { 253$EV::DIED = sub {
211 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
212}; 255};
213 256
214############################################################################# 257#############################################################################
215 258
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 282 $d
240 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
241} 284}
242 285
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
250 293
251=cut 294=cut
252 295
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 297
255sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
257 300
258=item cf::lock_wait $string 301=item cf::lock_wait $string
259 302
260Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
261 304
264Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
267returned. 310returned.
268 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
269Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
271 317
272=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
273 319
274Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
275 321
276=cut 322=cut
277 323
278our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
279 326
280sub lock_wait($) { 327sub lock_wait($) {
281 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
282 334
283 # wait for lock, if any 335 # wait for lock, if any
284 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 338 Coro::schedule;
292 344
293 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
294 lock_wait $key; 346 lock_wait $key;
295 347
296 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
297 350
298 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
301 } 355 }
302} 356}
303 357
306 360
307 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
308} 362}
309 363
310sub freeze_mainloop { 364sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
312 366
313 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
314 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
315 }; 428 }
316 $TICK_WATCHER->stop; 429};
317 $guard 430
431sub get_slot($;$$) {
432 my ($time, $pri, $name) = @_;
433
434 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal;
436
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready;
440 $sig->wait;
318} 441}
319 442
320=item cf::async { BLOCK } 443=item cf::async { BLOCK }
321 444
322Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
327 450
328BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
329 452
330=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
331 454
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 458acceptable.
336 459
337If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
343 466
344sub sync_job(&) { 467sub sync_job(&) {
345 my ($job) = @_; 468 my ($job) = @_;
346 469
347 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 471 my $time = EV::time;
349 472
350 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
352 475
353 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 477
355 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
356 479
357 my $busy = 1; 480 my $busy = 1;
358 my @res; 481 my @res;
359 482
360 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 485 @res = eval { $job->() };
362 warn $@ if $@; 486 warn $@ if $@;
363 undef $busy; 487 undef $busy;
364 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
365 489
366 while ($busy) { 490 while ($busy) {
367 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
368 } 495 }
496 }
369 497
370 $time = Event::time - $time; 498 my $time = EV::time - $time;
371 499
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
376 501
377 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
378 } else { 503 } else {
379 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
380 505
405=item fork_call { }, $args 530=item fork_call { }, $args
406 531
407Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
411 536
412=cut 537=cut
413 538
414sub fork_call(&@) { 539sub fork_call(&@) {
415 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
416 541
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 545
422 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 547 reset_signals;
435 local $SIG{__WARN__}; 548 &$cb
436 local $SIG{__DIE__}; 549 }, @args;
437 eval {
438 close $fh1;
439 550
440 my @res = eval { $cb->(@args) }; 551 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 552}
448 553
449=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
450 555
451Returns a single value from the environment database. 556Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
454 559
455Stores the given C<$value> in the family. It can currently store binary 560Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 561data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 562
563=item $db = cf::db_table "name"
564
565Create and/or open a new database table. The string must not be "db" and must be unique
566within each server.
567
458=cut 568=cut
569
570sub db_table($) {
571 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV;
573
574 eval {
575 $db->set_flags (BDB::CHKSUM);
576
577 utf8::encode $name;
578 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
579 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
580 cf::cleanup "db_open(db): $!" if $!;
581 };
582 cf::cleanup "db_open(db): $@" if $@;
583
584 $db
585}
459 586
460our $DB; 587our $DB;
461 588
462sub db_init { 589sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 590 cf::sync_job {
467 eval { 591 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 592 };
477} 593}
478 594
479sub db_get($$) { 595sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
481 597
531 if (1) { 647 if (1) {
532 $md5 = 648 $md5 =
533 join "\x00", 649 join "\x00",
534 $processversion, 650 $processversion,
535 map { 651 map {
536 Coro::cede; 652 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 654 } 0.. $#$src;
539 655
540 656
541 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
587 703
588In the following description, CLASS can be any of C<global>, C<object> 704In the following description, CLASS can be any of C<global>, C<object>
589C<player>, C<client> or C<map> (i.e. the attachable objects in 705C<player>, C<client> or C<map> (i.e. the attachable objects in
590Crossfire TRT). 706Deliantra).
591 707
592=over 4 708=over 4
593 709
594=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
595 711
847 "; 963 ";
848 die if $@; 964 die if $@;
849} 965}
850 966
851our $override; 967our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 968our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 969
854sub override { 970sub override {
855 $override = 1; 971 $override = 1;
856 @invoke_results = (); 972 @INVOKE_RESULTS = (@_);
857} 973}
858 974
859sub do_invoke { 975sub do_invoke {
860 my $event = shift; 976 my $event = shift;
861 my $callbacks = shift; 977 my $callbacks = shift;
862 978
863 @invoke_results = (); 979 @INVOKE_RESULTS = ();
864 980
865 local $override; 981 local $override;
866 982
867 for (@$callbacks) { 983 for (@$callbacks) {
868 eval { &{$_->[1]} }; 984 eval { &{$_->[1]} };
877 } 993 }
878 994
879 0 995 0
880} 996}
881 997
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 999
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1001
886Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
887 1003
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1004This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 1005removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 1006results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1007
892=back 1008=back
893 1009
894=cut 1010=cut
895 1011
896############################################################################# 1012#############################################################################
897# object support 1013# object support
1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
1048sub _can_merge {
1049 my ($ob1, $ob2) = @_;
1050
1051 ++$SLOW_MERGES;#d#
1052
1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
1055}
898 1056
899sub reattach { 1057sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1059 my ($obj) = @_;
902 1060
923cf::attachable->attach ( 1081cf::attachable->attach (
924 prio => -1000000, 1082 prio => -1000000,
925 on_instantiate => sub { 1083 on_instantiate => sub {
926 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
927 1085
928 $data = from_json $data; 1086 $data = decode_json $data;
929 1087
930 for (@$data) { 1088 for (@$data) {
931 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
932 1090
933 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1107sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
951 1109
952 sync_job { 1110 sync_job {
953 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
956 1115
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1120 close $fh;
962 1121
963 if (@$objs) { 1122 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1128 close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
971 } 1130 }
979 } 1138 }
980 } else { 1139 } else {
981 aio_unlink $filename; 1140 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
983 } 1142 }
984 } 1143 };
985} 1144}
986 1145
987sub object_freezer_as_string { 1146sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
989 1148
1001 or return; 1160 or return;
1002 1161
1003 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1164 or return;
1165
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1007 } 1168 }
1008 1169
1170 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1011 return ($data, $av); 1174 ($data, $av)
1012} 1175}
1013 1176
1014=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1015 1178
1016=over 4 1179=over 4
1089 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1090 1253
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1255
1093 if (ref $msg) { 1256 if (ref $msg) {
1257 my ($type, $reply, @payload) =
1258 "ARRAY" eq ref $msg
1259 ? @$msg
1260 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1261
1262 my @reply;
1263
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1099 } else { 1271 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1273 }
1102 1274
1103 cf::override; 1275 cf::override;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1158 1330
1159 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1332 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1334 }
1164 1335
1165 warn $msg; 1336 warn $msg;
1166 } 1337 }
1167 1338
1192use Coro::AIO; 1363use Coro::AIO;
1193 1364
1194=head3 cf::player 1365=head3 cf::player
1195 1366
1196=over 4 1367=over 4
1368
1369=item cf::player::num_playing
1370
1371Returns the official number of playing players, as per the Crossfire metaserver rules.
1372
1373=cut
1374
1375sub num_playing {
1376 scalar grep
1377 $_->ob->map
1378 && !$_->hidden
1379 && !$_->ob->flag (cf::FLAG_WIZ),
1380 cf::player::list
1381}
1197 1382
1198=item cf::player::find $login 1383=item cf::player::find $login
1199 1384
1200Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1201 1386
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1426
1242 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1428 or return;
1429
1430 my $pl = cf::player::load_pl $f
1431 or return;
1432 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1245 } 1435 }
1246 } 1436 }
1247} 1437}
1248 1438
1258 1448
1259 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1261 1451
1262 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1263 Coro::cede; 1453 cf::cede_to_tick;
1264} 1454}
1265 1455
1266sub new($) { 1456sub new($) {
1267 my ($login) = @_; 1457 my ($login) = @_;
1268 1458
1272 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1273 1463
1274 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1275 1465
1276 $self 1466 $self
1467}
1468
1469=item $player->send_msg ($channel, $msg, $color, [extra...])
1470
1471=cut
1472
1473sub send_msg {
1474 my $ns = shift->ns
1475 or return;
1476 $ns->send_msg (@_);
1277} 1477}
1278 1478
1279=item $pl->quit_character 1479=item $pl->quit_character
1280 1480
1281Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1536 or return [];
1337 1537
1338 my @logins; 1538 my @logins;
1339 1539
1340 for my $login (@$dirs) { 1540 for my $login (@$dirs) {
1541 my $path = path $login;
1542
1543 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1344 1549
1345 utf8::decode $login; 1550 utf8::decode $login;
1346 push @logins, $login; 1551 push @logins, $login;
1347 } 1552 }
1348 1553
1381 1586
1382Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1383 1588
1384=cut 1589=cut
1385 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1386sub expand_cfpod { 1602sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1388 1604
1389 # escape & and < 1605 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1606
1393 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1394 1610
1395 1 while 1611 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1616 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1402 $self->gender ? $2 : $1 1618 (?:
1403 }ge 1619 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1620 | < $interior >
1405 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1406 { 1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1644 "")
1410 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1412 1656
1657 for ($xml) {
1413 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1415 1660
1416 # compress some whitespace 1661 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1418 1667
1419 $_ 1668 $xml
1420} 1669}
1670
1671no re 'eval';
1421 1672
1422sub hintmode { 1673sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1675 $_[0]{hintmode}
1426} 1676}
1427 1677
1428=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1429 1679
1430Sends an ext reply to the player. 1680Sends an ext reply to the player.
1431 1681
1432=cut 1682=cut
1433 1683
1434sub ext_reply($$%) { 1684sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1436 1686
1437 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1688}
1440 1689
1441=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1442 1691
1443Sends an ext event to the client. 1692Sends an ext event to the client.
1444 1693
1445=cut 1694=cut
1446 1695
1447sub ext_event($$%) { 1696sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1449 1698
1450 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1451} 1700}
1452 1701
1453=head3 cf::region 1702=head3 cf::region
1454 1703
1455=over 4 1704=over 4
1468 my ($path) = @_; 1717 my ($path) = @_;
1469 1718
1470 my ($match, $specificity); 1719 my ($match, $specificity);
1471 1720
1472 for my $region (list) { 1721 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1722 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1723 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1724 if $region->specificity > $specificity;
1476 } 1725 }
1477 } 1726 }
1478 1727
1598 $self->init; # pass $1 etc. 1847 $self->init; # pass $1 etc.
1599 return $self; 1848 return $self;
1600 } 1849 }
1601 } 1850 }
1602 1851
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1852 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1853 ()
1605} 1854}
1606 1855
1607sub init { 1856sub init {
1608 my ($self) = @_; 1857 my ($self) = @_;
1671 1920
1672sub load_header_from($) { 1921sub load_header_from($) {
1673 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1674 1923
1675 utf8::encode $path; 1924 utf8::encode $path;
1676 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1677 # or return;
1678
1679 $self->_load_header ($path)
1680 or return; 1926 or return;
1927
1928 $self->_load_header ($f)
1929 or return;
1930
1931 local $MAP_LOADING{$self->{path}} = $self;
1932 $f->resolve_delayed_derefs;
1681 1933
1682 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1683 1935
1684 1 1936 1
1685} 1937}
1739sub find { 1991sub find {
1740 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1741 1993
1742 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1743 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1744 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1745 1998
1746 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1747 my $guard = cf::lock_acquire "map_find:$path"; 2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
1748 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1749 or return; 2004 or return;
1750 2005
1751 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1752 2007
1754 or return; 2009 or return;
1755 2010
1756 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1758 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1759 $map->reset; 2016 $map->reset;
1760 undef $guard;
1761 return find $path; 2017 return find $path;
1762 } 2018 }
1763 2019
1764 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1765 } 2021 }
1774 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1775 2031
1776 my $path = $self->{path}; 2032 my $path = $self->{path};
1777 2033
1778 { 2034 {
1779 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1780 2036
2037 return unless $self->valid;
1781 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1782 2039
1783 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1784 2041
1785 $self->alloc; 2042 $self->alloc;
1786 2043
1787 $self->pre_load; 2044 $self->pre_load;
1788 Coro::cede; 2045 cf::cede_to_tick;
1789 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1790 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1791 or return; 2050 or return;
1792 2051
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1795 2054
1796 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1797 utf8::encode $uniq; 2056 utf8::encode $uniq;
1798 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1799 $self->clear_unique_items; 2059 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1801 } 2063 }
1802 } 2064 }
1803 2065
1804 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1805 # now do the right thing for maps 2069 # now do the right thing for maps
1806 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 2072 unless $self->difficulty;
1809 Coro::cede; 2073 cf::cede_to_tick;
1810 2074
1811 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 2076 $self->decay_objects;
1813 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1814 $self->update_buttons; 2078 $self->update_buttons;
1815 Coro::cede; 2079 cf::cede_to_tick;
1816 $self->set_darkness_map; 2080 $self->set_darkness_map;
1817 Coro::cede; 2081 cf::cede_to_tick;
1818 $self->activate; 2082 $self->activate;
1819 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1820 2087
1821 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 2089 }
1823 2090
1824 $self->post_load; 2091 $self->post_load;
1835 2102
1836 $self 2103 $self
1837} 2104}
1838 2105
1839# find and load all maps in the 3x3 area around a map 2106# find and load all maps in the 3x3 area around a map
1840sub load_diag { 2107sub load_neighbours {
1841 my ($map) = @_; 2108 my ($map) = @_;
1842 2109
1843 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1844 2111
1845 for (0 .. 3) { 2112 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1847 or next; 2114 or next;
1848 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1849 or next; 2116 or next;
1850 $neigh->load; 2117 $neigh->load;
1851 2118
2119 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 2122 }
1855 2123
1856 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1858 or next; 2127 or next;
1859 $neigh->load; 2128 $neigh->load;
1860 } 2129 }
1861} 2130}
1862 2131
1867} 2136}
1868 2137
1869sub do_load_sync { 2138sub do_load_sync {
1870 my ($map) = @_; 2139 my ($map) = @_;
1871 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1872 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1873} 2145}
1874 2146
1875our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1877 2149
1878sub find_async { 2150sub find_async {
1879 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1880 2152
1881 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1882 2154
1883 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 2157 }
1886 2158
1887 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1888 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1889 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 2166 if (my $map = find $k) {
1892 or next;
1893 $map->load; 2167 $map->load if $v;
2168 }
1894 2169
1895 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1896 } 2171 }
1897 } 2172 }
1898 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1899 }; 2174 };
1900 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1903} 2178}
1904 2179
1905sub save { 2180sub save {
1906 my ($self) = @_; 2181 my ($self) = @_;
1907 2182
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2184
1910 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1911 2186
1912 return unless $self->dirty; 2187 return unless $self->dirty;
1913 2188
1919 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1920 2195
1921 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
1922 2197
1923 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
1924 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
1925 }; 2201 };
1926 2202
1927 if ($uniq) { 2203 if ($uniq) {
1928 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1936 my ($self) = @_; 2212 my ($self) = @_;
1937 2213
1938 # save first because save cedes 2214 # save first because save cedes
1939 $self->save; 2215 $self->save;
1940 2216
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2218
1943 return if $self->players; 2219 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1946 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
1947 $self->clear; 2227 $self->clear;
1948 $self->in_memory (cf::MAP_SWAPPED);
1949} 2228}
1950 2229
1951sub reset_at { 2230sub reset_at {
1952 my ($self) = @_; 2231 my ($self) = @_;
1953 2232
1985 if $uniq; 2264 if $uniq;
1986 } 2265 }
1987 2266
1988 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
1989 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
1990 $self->clear; 2271 $self->clear;
1991
1992 $_->clear_links_to ($self) for values %cf::MAP;
1993 2272
1994 $self->unlink_save; 2273 $self->unlink_save;
1995 $self->destroy; 2274 $self->destroy;
1996} 2275}
1997 2276
1998my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
1999 2278
2000sub nuke { 2279sub nuke {
2001 my ($self) = @_; 2280 my ($self) = @_;
2002 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2003 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2004 2286
2005 $self->unlink_save; 2287 $self->unlink_save;
2006 2288
2007 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2294
2013 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2014 2297
2015 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2016} 2299}
2017 2300
2018=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2094 2377
2095sub inv_recursive { 2378sub inv_recursive {
2096 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2097} 2380}
2098 2381
2382=item $ref = $ob->ref
2383
2384creates and returns a persistent reference to an objetc that can be stored as a string.
2385
2386=item $ob = cf::object::deref ($refstring)
2387
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block.
2390
2391=cut
2392
2393sub deref {
2394 my ($ref) = @_;
2395
2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2397 my ($uuid, $name) = ($1, $2);
2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2399 or return;
2400 $pl->ob->uuid eq $uuid
2401 or return;
2402
2403 $pl->ob
2404 } else {
2405 warn "$ref: cannot resolve object reference\n";
2406 undef
2407 }
2408}
2409
2099package cf; 2410package cf;
2100 2411
2101=back 2412=back
2102 2413
2103=head3 cf::object::player 2414=head3 cf::object::player
2125 2436
2126 } else { 2437 } else {
2127 my $pl = $self->contr; 2438 my $pl = $self->contr;
2128 2439
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2443
2138 } else { 2444 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2141 } 2447 }
2142 } 2448 }
2449}
2450
2451=item $object->send_msg ($channel, $msg, $color, [extra...])
2452
2453=cut
2454
2455sub cf::object::send_msg {
2456 my $pl = shift->contr
2457 or return;
2458 $pl->send_msg (@_);
2143} 2459}
2144 2460
2145=item $player_object->may ("access") 2461=item $player_object->may ("access")
2146 2462
2147Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2226 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2229 2545
2230 $map->load; 2546 $map->load;
2231 $map->load_diag; 2547 $map->load_neighbours;
2232 2548
2233 return unless $self->contr->active; 2549 return unless $self->contr->active;
2234 $self->activate_recursive; 2550 $self->activate_recursive;
2235 2551
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2553 $self->enter_map ($map, $x, $y);
2238} 2554}
2239 2555
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2557
2242Moves the player to the given map-path and coordinates by first freezing 2558Moves the player to the given map-path and coordinates by first freezing
2243her, loading and preparing them map, calling the provided $check callback 2559her, loading and preparing them map, calling the provided $check callback
2244that has to return the map if sucecssful, and then unfreezes the player on 2560that has to return the map if sucecssful, and then unfreezes the player on
2245the new (success) or old (failed) map position. 2561the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process.
2246 2563
2247=cut 2564=cut
2248 2565
2249our $GOTOGEN; 2566our $GOTOGEN;
2250 2567
2251sub cf::object::player::goto { 2568sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2569 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2570
2254 # do generation counting so two concurrent goto's will be executed in-order 2571 # do generation counting so two concurrent goto's will be executed in-order
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2573
2257 $self->enter_link; 2574 $self->enter_link;
2258 2575
2259 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2579 # *tag paths override both path and x|y
2580 if ($path =~ /^\*(.*)$/) {
2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2582 my $ob = $obs[rand @obs];
2583
2584 # see if we actually can go there
2585 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2586 $ob = $obs[rand @obs];
2587 } else {
2588 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 }
2590 # else put us there anyways for now #d#
2591
2592 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2593 } else {
2594 ($path, $x, $y) = (undef, undef, undef);
2595 }
2596 }
2597
2260 my $map = eval { 2598 my $map = eval {
2261 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2262 2600
2263 if ($map) { 2601 if ($map) {
2264 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2265 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2266 } else { 2604 } else {
2267 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2268 } 2606 }
2269 2607
2270 $map 2608 $map
2271 }; 2609 };
2272 2610
2277 2615
2278 if ($gen == $self->{_goto_generation}) { 2616 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2617 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2618 $self->leave_link ($map, $x, $y);
2281 } 2619 }
2620
2621 $done->() if $done;
2282 })->prio (1); 2622 })->prio (1);
2283} 2623}
2284 2624
2285=item $player_object->enter_exit ($exit_object) 2625=item $player_object->enter_exit ($exit_object)
2286 2626
2323 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2324 } 2664 }
2325 2665
2326 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2327 2667
2328 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2329 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2330 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2331 2671
2332 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2333 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2355 my $hp = $exit->stats->hp; 2695 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2696 my $sp = $exit->stats->sp;
2357 2697
2358 $self->enter_link; 2698 $self->enter_link;
2359 2699
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2360 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2361 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2708 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2364 2710
2365 1; 2711 1;
2391 2737
2392 utf8::encode $text; 2738 utf8::encode $text;
2393 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2394} 2740}
2395 2741
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2742=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2743
2398Send a drawinfo or msg packet to the client, formatting the msg for the 2744Send a drawinfo or msg packet to the client, formatting the msg for the
2399client if neccessary. C<$type> should be a string identifying the type of 2745client if neccessary. C<$type> should be a string identifying the type of
2400the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2401the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2402 2748
2403=cut 2749=cut
2404 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801);
2802
2405sub cf::client::send_msg { 2803sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2805
2408 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2409 2807
2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809
2810 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2819 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2825 }
2826
2827 $channel = $channel->{id};
2828 }
2829
2830 return unless @extra || length $msg;
2831
2410 if ($self->can_msg) { 2832 if ($self->can_msg) {
2833 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF;
2836
2411 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2837 $self->send_packet ("msg " . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412 } else { 2839 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 if ($color >= 0) { 2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850
2851 $color &= cf::NDI_COLOR_MASK;
2852
2853 utf8::encode $msg;
2854
2424 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2858 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2429 } 2861 }
2430 } 2862 }
2431 } 2863 }
2432} 2864}
2433 2865
2434=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2435 2867
2436Sends an ext event to the client. 2868Sends an ext event to the client.
2437 2869
2438=cut 2870=cut
2439 2871
2440sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2442 2874
2875 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2881}
2882
2883=item $client->ext_reply ($msgid, @msg)
2884
2885Sends an ext reply to the client.
2886
2887=cut
2888
2889sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_;
2891
2892 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 }
2445} 2899}
2446 2900
2447=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2448 2902
2449Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2504 my ($ns, $buf) = @_; 2958 my ($ns, $buf) = @_;
2505 2959
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2961
2508 if (ref $msg) { 2962 if (ref $msg) {
2963 my ($type, $reply, @payload) =
2964 "ARRAY" eq ref $msg
2965 ? @$msg
2966 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2967
2968 my @reply;
2969
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2970 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 2971 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2515 } else { 2977 } else {
2516 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517 } 2979 }
2518 2980
2519 cf::override; 2981 cf::override;
2566our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2568 3030
2569$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2570 3032
2571$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3033$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math
3035 grepstart grepwhile mapstart mapwhile
3036 sort time
3037));
2572 3038
2573# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2574 3040
2575=pod 3041=pod
2576 3042
2577The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2578 3044
2579 cf::object contr pay_amount pay_player map 3045 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr
3048
2580 cf::object::player player 3049 cf::object::player
2581 cf::player peaceful 3050 player
2582 cf::map trigger 3051
3052 cf::player
3053 peaceful
3054
3055 cf::map
3056 trigger
2583 3057
2584=cut 3058=cut
2585 3059
2586for ( 3060for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race
3063 decrease_ob_nr destroy)],
2588 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2591) { 3067) {
2592 no strict 'refs'; 3068 no strict 'refs';
2668# the server's init and main functions 3144# the server's init and main functions
2669 3145
2670sub load_facedata($) { 3146sub load_facedata($) {
2671 my ($path) = @_; 3147 my ($path) = @_;
2672 3148
3149 # HACK to clear player env face cache, we need some signal framework
3150 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = ();
3152
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154
2673 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2674 3156
2675 my $facedata; 3157 my $facedata;
2676 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 3159 or die "$path: $!";
2679 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2680 3162
2681 $facedata->{version} == 2 3163 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 3165
3166 # patch in the exptable
3167 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3170 };
3171 cf::cede_to_tick;
3172
2684 { 3173 {
2685 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2686 3175
2687 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3179 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 3183
3184 cf::cede_to_tick;
2693 } 3185 }
2694 3186
2695 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2697 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2698 or next; 3191 or next;
3192
2699 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 3196 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 3198 }
2704 Coro::cede; 3199
3200 cf::cede_to_tick;
2705 } 3201 }
2706 } 3202 }
2707 3203
2708 { 3204 {
2709 my $anims = $facedata->{animinfo}; 3205 my $anims = $facedata->{animinfo};
2710 3206
2711 while (my ($anim, $info) = each %$anims) { 3207 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3208 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 3209 cf::cede_to_tick;
2714 } 3210 }
2715 3211
2716 cf::anim::invalidate_all; # d'oh 3212 cf::anim::invalidate_all; # d'oh
2717 } 3213 }
2718 3214
3215 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource};
3219
3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224
3225 if ($info->{type} & 1) {
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
3240 } else {
3241 $RESOURCE{$name} = $info;
3242 }
3243
3244 cf::cede_to_tick;
3245 }
3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249
2719 1 3250 1
2720} 3251}
2721 3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272
3273register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_;
3275
3276 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v);
3278 }
3279};
3280
2722sub reload_regions { 3281sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = ();
3285
2723 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2724 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
3288
3289 for (cf::region::list) {
3290 $_->{match} = qr/$_->{match}/
3291 if exists $_->{match};
3292 }
2725} 3293}
2726 3294
2727sub reload_facedata { 3295sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3296 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3297 or die "unable to load facedata\n";
2758 3326
2759sub init { 3327sub init {
2760 reload_resources; 3328 reload_resources;
2761} 3329}
2762 3330
2763sub cfg_load { 3331sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3333 or return;
2766 3334
2767 local $/; 3335 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2769 3337
2770 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2771 3339
2772 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2773 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2784sub main { 3352sub main {
2785 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2786 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2787 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2788 (async { 3356 (async {
2789 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2790 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2791 }; 3360 };
2792 3361
2793 cfg_load; 3362 reload_config;
2794 db_init; 3363 db_init;
2795 load_extensions; 3364 load_extensions;
2796 3365
2797 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
2798 Event::loop; 3368 EV::loop;
2799} 3369}
2800 3370
2801############################################################################# 3371#############################################################################
2802# initialisation and cleanup 3372# initialisation and cleanup
2803 3373
2804# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2805BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2806 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2807 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2808 reentrant => 0,
2809 data => WF_AUTOCANCEL,
2810 signal => $signal,
2811 prio => 0,
2812 cb => sub {
2813 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
2814 },
2815 ); 3380 };
2816 } 3381 }
2817} 3382}
2818 3383
2819sub write_runtime { 3384sub write_runtime {
2820 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
2865 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
2866 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
2867 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
2868 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
2869 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2870 $pl->save; 3436 $pl->save;
2871 } 3437 }
2872 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
2873 3439
2874 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
2913 warn "syncing database to disk"; 3479 warn "syncing database to disk";
2914 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
2915 3481
2916 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
2917 3483
2918 warn "cancelling all WF_AUTOCANCEL watchers";
2919 for (Event::all_watchers) {
2920 $_->cancel if $_->data & WF_AUTOCANCEL;
2921 }
2922
2923 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
2924 for (;;) { 3485 for (;;) {
2925 BDB::flush; 3486 BDB::flush;
2926 IO::AIO::flush; 3487 IO::AIO::flush;
2927 Coro::cede; 3488 Coro::cede_notself;
2928 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
2929 warn "iterate..."; 3490 warn "iterate...";
2930 } 3491 }
2931 3492
2932 ++$RELOAD; 3493 ++$RELOAD;
2991 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
2992 require cf; 3553 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3555
2995 warn "loading config and database again"; 3556 warn "loading config and database again";
2996 cf::cfg_load; 3557 cf::reload_config;
2997 3558
2998 warn "loading extensions"; 3559 warn "loading extensions";
2999 cf::load_extensions; 3560 cf::load_extensions;
3000 3561
3001 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3008 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3009 3570
3010 1 3571 1
3011 } or do { 3572 } or do {
3012 warn $@; 3573 warn $@;
3013 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3014 exit 1;
3015 }; 3575 };
3016 3576
3017 warn "reloaded"; 3577 warn "reloaded";
3018}; 3578};
3019 3579
3021 3581
3022sub reload_perl() { 3582sub reload_perl() {
3023 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3024 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3025 3585
3026 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3027 reentrant => 0,
3028 after => 0,
3029 data => WF_AUTOCANCEL,
3030 cb => sub {
3031 do_reload_perl; 3587 do_reload_perl;
3032 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3033 },
3034 ); 3589 };
3035} 3590}
3036 3591
3037register_command "reload" => sub { 3592register_command "reload" => sub {
3038 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3039 3594
3040 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3041 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3042 async { reload_perl }; 3599 reload_perl;
3600 };
3043 } 3601 }
3044}; 3602};
3045 3603
3046unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3047 3605
3049 3607
3050our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3051our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3052 3610
3053sub wait_for_tick { 3611sub wait_for_tick {
3054 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3055 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3056 3614
3057 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3058 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3059 $signal->wait; 3617 $signal->wait;
3060} 3618}
3061 3619
3062sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3063 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3064 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3065 3623
3066 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3067 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3068 $signal->wait; 3626 $signal->wait;
3069} 3627}
3070 3628
3071 my $min = 1e6;#d# 3629sub tick {
3072 my $avg = 10;
3073$TICK_WATCHER = Event->timer (
3074 reentrant => 0,
3075 parked => 1,
3076 prio => 0,
3077 at => $NEXT_TICK || $TICK,
3078 data => WF_AUTOCANCEL,
3079 cb => sub {
3080 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3081 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3082 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3083 return; 3633 return;
3084 } 3634 }
3085 3635
3086 $NOW = $tick_start = Event::time;
3087
3088 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3089 3637
3090 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3091 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3092 my $t = Event::time; 3640 Coro::async_pool {
3093 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3094 or die; 3642 write_runtime
3095 3643 or warn "ERROR: unable to write runtime file: $!";
3096 $map->width (50);
3097 $map->height (50);
3098 $map->alloc;
3099 $map->_load_objects ("/tmp/x.map", 1);
3100 my $t = Event::time - $t;
3101
3102 #next unless $t < 0.0013;#d#
3103 if ($t < $min) {
3104 $min = $t;
3105 }
3106 $avg = $avg * 0.99 + $t * 0.01;
3107 }
3108 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3109 exit 0;
3110 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3111 }; 3644 };
3645 }
3112 3646
3113 $RUNTIME += $TICK;
3114 $NEXT_TICK += $TICK;
3115
3116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3117 $NEXT_RUNTIME_WRITE = $NOW + 10;
3118 Coro::async_pool {
3119 write_runtime
3120 or warn "ERROR: unable to write runtime file: $!";
3121 };
3122 }
3123
3124# my $AFTER = Event::time;
3125# warn $AFTER - $NOW;#d#
3126
3127 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3128 $sig->send; 3648 $sig->send;
3129 } 3649 }
3130 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3131 $sig->send; 3651 $sig->send;
3132 } 3652 }
3133 3653
3134 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3135
3136 # if we are delayed by four ticks or more, skip them all
3137 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3138
3139 $TICK_WATCHER->at ($NEXT_TICK);
3140 $TICK_WATCHER->start;
3141
3142 $LOAD = ($NOW - $tick_start) / $TICK;
3143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144 3656
3145 _post_tick; 3657 if (0) {
3146 3658 if ($NEXT_TICK) {
3147 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3148 }, 3663 }
3149); 3664}
3150 3665
3151{ 3666{
3152 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3153 $BDB_POLL_WATCHER = Event->io ( 3668
3154 reentrant => 0,
3155 fd => BDB::poll_fileno,
3156 poll => 'r',
3157 prio => 0,
3158 data => WF_AUTOCANCEL,
3159 cb => \&BDB::poll_cb,
3160 );
3161 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3162 3670 BDB::max_poll_reqs $TICK * 0.1;
3163 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3164 my $status;
3165 my $current = $Coro::current;
3166 (
3167 sub {
3168 $status = $!;
3169 $current->ready; undef $current;
3170 },
3171 sub {
3172 Coro::schedule while defined $current;
3173 $! = $status;
3174 },
3175 )
3176 };
3177 3672
3178 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3179 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1);
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3180 3679
3181 cf::sync_job { 3680 cf::sync_job {
3182 eval { 3681 eval {
3183 BDB::db_env_open 3682 BDB::db_env_open
3184 $DB_ENV, 3683 $DB_ENV,
3186 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3685 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3187 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3188 0666; 3687 0666;
3189 3688
3190 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3191
3192 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3193 $DB_ENV->set_lk_detect;
3194 }; 3690 };
3195 3691
3196 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3197 }; 3693 };
3198 } 3694 }
3695
3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3698 };
3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 };
3199} 3705}
3200 3706
3201{ 3707{
3708 # configure IO::AIO
3709
3202 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3203
3204 undef $Coro::AIO::WATCHER;
3205 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3206 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 fd => IO::AIO::poll_fileno,
3210 poll => 'r',
3211 prio => 6,
3212 cb => \&IO::AIO::poll_cb,
3213 );
3214} 3713}
3215 3714
3216my $_log_backtrace; 3715my $_log_backtrace;
3217 3716
3218sub _log_backtrace { 3717sub _log_backtrace {
3222 3721
3223 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3224 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3225 ++$_log_backtrace; 3724 ++$_log_backtrace;
3226 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3227 my @bt = fork_call { 3728 my @bt = fork_call {
3228 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3229 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3230 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3731 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3231 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines