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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.413 by root, Sun Apr 6 16:13:20 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.32 ();
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 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;
319} 441}
320 442
321=item cf::async { BLOCK } 443=item cf::async { BLOCK }
322 444
323Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
328 450
329BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
330 452
331=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
332 454
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 456is 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 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 458acceptable.
337 459
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
344 466
345sub sync_job(&) { 467sub sync_job(&) {
346 my ($job) = @_; 468 my ($job) = @_;
347 469
348 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 471 my $time = EV::time;
350 472
351 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
353 475
354 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 477
356 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
357 479
358 my $busy = 1; 480 my $busy = 1;
359 my @res; 481 my @res;
360 482
361 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 485 @res = eval { $job->() };
363 warn $@ if $@; 486 warn $@ if $@;
364 undef $busy; 487 undef $busy;
365 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
366 489
367 while ($busy) { 490 while ($busy) {
368 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
369 } 495 }
496 }
370 497
371 $time = Event::time - $time; 498 my $time = EV::time - $time;
372 499
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 500 $TICK_START += $time; # do not account sync jobs to server load
377 501
378 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
379 } else { 503 } else {
380 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
381 505
406=item fork_call { }, $args 530=item fork_call { }, $args
407 531
408Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
412 536
413=cut 537=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 538
424sub fork_call(&@) { 539sub fork_call(&@) {
425 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
426 541
427# 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,
428# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 545
432 if (my $pid = fork) { 546 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; 547 reset_signals;
446 local $SIG{__WARN__}; 548 &$cb
447 local $SIG{__DIE__}; 549 }, @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 550
454 eval { 551 wantarray ? @res : $res[-1]
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 }
466} 552}
467 553
468=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
469 555
470Returns a single value from the environment database. 556Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
473 559
474Stores 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
475data 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).
476 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
477=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}
478 586
479our $DB; 587our $DB;
480 588
481sub db_init { 589sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 590 cf::sync_job {
486 eval { 591 $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 } 592 };
496} 593}
497 594
498sub db_get($$) { 595sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
500 597
550 if (1) { 647 if (1) {
551 $md5 = 648 $md5 =
552 join "\x00", 649 join "\x00",
553 $processversion, 650 $processversion,
554 map { 651 map {
555 Coro::cede; 652 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 654 } 0.. $#$src;
558 655
559 656
560 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
604attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
606 703
607In 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>
608C<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
609Crossfire TRT). 706Deliantra).
610 707
611=over 4 708=over 4
612 709
613=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
614 711
866 "; 963 ";
867 die if $@; 964 die if $@;
868} 965}
869 966
870our $override; 967our $override;
871our @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?
872 969
873sub override { 970sub override {
874 $override = 1; 971 $override = 1;
875 @invoke_results = (); 972 @INVOKE_RESULTS = (@_);
876} 973}
877 974
878sub do_invoke { 975sub do_invoke {
879 my $event = shift; 976 my $event = shift;
880 my $callbacks = shift; 977 my $callbacks = shift;
881 978
882 @invoke_results = (); 979 @INVOKE_RESULTS = ();
883 980
884 local $override; 981 local $override;
885 982
886 for (@$callbacks) { 983 for (@$callbacks) {
887 eval { &{$_->[1]} }; 984 eval { &{$_->[1]} };
896 } 993 }
897 994
898 0 995 0
899} 996}
900 997
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 999
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1001
905Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
906 1003
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 1006results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1007
911=back 1008=back
912 1009
913=cut 1010=cut
914 1011
915############################################################################# 1012#############################################################################
916# 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}
917 1056
918sub reattach { 1057sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1059 my ($obj) = @_;
921 1060
942cf::attachable->attach ( 1081cf::attachable->attach (
943 prio => -1000000, 1082 prio => -1000000,
944 on_instantiate => sub { 1083 on_instantiate => sub {
945 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
946 1085
947 $data = from_json $data; 1086 $data = decode_json $data;
948 1087
949 for (@$data) { 1088 for (@$data) {
950 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
951 1090
952 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1107sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
970 1109
971 sync_job { 1110 sync_job {
972 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
975 1115
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1120 close $fh;
981 1121
982 if (@$objs) { 1122 if (@$objs) {
983 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) {
984 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1128 close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
990 } 1130 }
998 } 1138 }
999 } else { 1139 } else {
1000 aio_unlink $filename; 1140 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1002 } 1142 }
1003 } 1143 };
1004} 1144}
1005 1145
1006sub object_freezer_as_string { 1146sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1008 1148
1020 or return; 1160 or return;
1021 1161
1022 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1164 or return;
1165
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1026 } 1168 }
1027 1169
1170 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1030 return ($data, $av); 1174 ($data, $av)
1031} 1175}
1032 1176
1033=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1034 1178
1035=over 4 1179=over 4
1108 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1109 1253
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1255
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1118 } else { 1271 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1273 }
1121 1274
1122 cf::override; 1275 cf::override;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1177 1330
1178 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1332 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1334 }
1183 1335
1184 warn $msg; 1336 warn $msg;
1185 } 1337 }
1186 1338
1211use Coro::AIO; 1363use Coro::AIO;
1212 1364
1213=head3 cf::player 1365=head3 cf::player
1214 1366
1215=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}
1216 1382
1217=item cf::player::find $login 1383=item cf::player::find $login
1218 1384
1219Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1220 1386
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1426
1261 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1262 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;
1263 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1264 } 1435 }
1265 } 1436 }
1266} 1437}
1267 1438
1277 1448
1278 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1280 1451
1281 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1282 Coro::cede; 1453 cf::cede_to_tick;
1283} 1454}
1284 1455
1285sub new($) { 1456sub new($) {
1286 my ($login) = @_; 1457 my ($login) = @_;
1287 1458
1291 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1292 1463
1293 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1294 1465
1295 $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 (@_);
1296} 1477}
1297 1478
1298=item $pl->quit_character 1479=item $pl->quit_character
1299 1480
1300Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1355 or return []; 1536 or return [];
1356 1537
1357 my @logins; 1538 my @logins;
1358 1539
1359 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") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1363 1549
1364 utf8::decode $login; 1550 utf8::decode $login;
1365 push @logins, $login; 1551 push @logins, $login;
1366 } 1552 }
1367 1553
1400 1586
1401Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1402 1588
1403=cut 1589=cut
1404 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
1405sub expand_cfpod { 1602sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1407 1604
1408 # escape & and < 1605 my $xml;
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1606
1412 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1413 1610
1414 1 while 1611 $group =~ s/&/&amp;/g;
1415 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1419 # replace G<male|female> tags 1616 ([BCGHITU])
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1421 $self->gender ? $2 : $1 1618 (?:
1422 }ge 1619 ([^<>]*) (?{ $group = $^N })
1423 # replace H<hint text> 1620 | < $interior >
1424 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1425 { 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") {
1426 ("<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>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1644 "")
1429 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1430 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1431 1656
1657 for ($xml) {
1432 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1434 1660
1435 # compress some whitespace 1661 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1440 1667
1441 $_ 1668 $xml
1442} 1669}
1670
1671no re 'eval';
1443 1672
1444sub hintmode { 1673sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1675 $_[0]{hintmode}
1447} 1676}
1448 1677
1449=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1450 1679
1451Sends an ext reply to the player. 1680Sends an ext reply to the player.
1452 1681
1453=cut 1682=cut
1454 1683
1455sub ext_reply($$%) { 1684sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1457 1686
1458 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1688}
1461 1689
1462=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1463 1691
1464Sends an ext event to the client. 1692Sends an ext event to the client.
1465 1693
1466=cut 1694=cut
1467 1695
1468sub ext_event($$%) { 1696sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1470 1698
1471 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1472} 1700}
1473 1701
1474=head3 cf::region 1702=head3 cf::region
1475 1703
1476=over 4 1704=over 4
1692 1920
1693sub load_header_from($) { 1921sub load_header_from($) {
1694 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1695 1923
1696 utf8::encode $path; 1924 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 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;
1702 1933
1703 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1704 1935
1705 1 1936 1
1706} 1937}
1760sub find { 1991sub find {
1761 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1762 1993
1763 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1764 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1766 1998
1767 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1768 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
1769 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1770 or return; 2004 or return;
1771 2005
1772 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1773 2007
1775 or return; 2009 or return;
1776 2010
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1780 $map->reset; 2016 $map->reset;
1781 undef $guard;
1782 return find $path; 2017 return find $path;
1783 } 2018 }
1784 2019
1785 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1786 } 2021 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1796 2031
1797 my $path = $self->{path}; 2032 my $path = $self->{path};
1798 2033
1799 { 2034 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1801 2036
2037 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2039
1804 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1805 2041
1806 $self->alloc; 2042 $self->alloc;
1807 2043
1808 $self->pre_load; 2044 $self->pre_load;
1809 Coro::cede; 2045 cf::cede_to_tick;
1810 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1812 or return; 2050 or return;
1813 2051
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1816 2054
1817 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2056 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2059 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1822 } 2063 }
1823 } 2064 }
1824 2065
1825 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1826 # now do the right thing for maps 2069 # now do the right thing for maps
1827 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2072 unless $self->difficulty;
1830 Coro::cede; 2073 cf::cede_to_tick;
1831 2074
1832 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2076 $self->decay_objects;
1834 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1835 $self->update_buttons; 2078 $self->update_buttons;
1836 Coro::cede; 2079 cf::cede_to_tick;
1837 $self->set_darkness_map; 2080 $self->set_darkness_map;
1838 Coro::cede; 2081 cf::cede_to_tick;
1839 $self->activate; 2082 $self->activate;
1840 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1841 2087
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 2089 }
1844 2090
1845 $self->post_load; 2091 $self->post_load;
1856 2102
1857 $self 2103 $self
1858} 2104}
1859 2105
1860# 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
1861sub load_diag { 2107sub load_neighbours {
1862 my ($map) = @_; 2108 my ($map) = @_;
1863 2109
1864 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1865 2111
1866 for (0 .. 3) { 2112 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1868 or next; 2114 or next;
1869 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1870 or next; 2116 or next;
1871 $neigh->load; 2117 $neigh->load;
1872 2118
2119 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2122 }
1876 2123
1877 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1879 or next; 2127 or next;
1880 $neigh->load; 2128 $neigh->load;
1881 } 2129 }
1882} 2130}
1883 2131
1888} 2136}
1889 2137
1890sub do_load_sync { 2138sub do_load_sync {
1891 my ($map) = @_; 2139 my ($map) = @_;
1892 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1893 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1894} 2145}
1895 2146
1896our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1898 2149
1899sub find_async { 2150sub find_async {
1900 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1901 2152
1902 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1903 2154
1904 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2157 }
1907 2158
1908 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1909 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1910 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 2166 if (my $map = find $k) {
1913 $map->load; 2167 $map->load if $v;
1914 } 2168 }
1915 2169
1916 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1917 } 2171 }
1918 } 2172 }
1919 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1920 }; 2174 };
1921 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1924} 2178}
1925 2179
1926sub save { 2180sub save {
1927 my ($self) = @_; 2181 my ($self) = @_;
1928 2182
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2184
1931 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1932 2186
1933 return unless $self->dirty; 2187 return unless $self->dirty;
1934 2188
1940 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1941 2195
1942 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
1943 2197
1944 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
1946 }; 2201 };
1947 2202
1948 if ($uniq) { 2203 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1957 my ($self) = @_; 2212 my ($self) = @_;
1958 2213
1959 # save first because save cedes 2214 # save first because save cedes
1960 $self->save; 2215 $self->save;
1961 2216
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2218
1964 return if $self->players; 2219 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1967 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2227 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2228}
1971 2229
1972sub reset_at { 2230sub reset_at {
1973 my ($self) = @_; 2231 my ($self) = @_;
1974 2232
2006 if $uniq; 2264 if $uniq;
2007 } 2265 }
2008 2266
2009 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2010 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2271 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2272
2015 $self->unlink_save; 2273 $self->unlink_save;
2016 $self->destroy; 2274 $self->destroy;
2017} 2275}
2018 2276
2019my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
2020 2278
2021sub nuke { 2279sub nuke {
2022 my ($self) = @_; 2280 my ($self) = @_;
2023 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2024 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2025 2286
2026 $self->unlink_save; 2287 $self->unlink_save;
2027 2288
2028 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2294
2034 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2035 2297
2036 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2037} 2299}
2038 2300
2039=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2115 2377
2116sub inv_recursive { 2378sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2118} 2380}
2119 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
2120package cf; 2410package cf;
2121 2411
2122=back 2412=back
2123 2413
2124=head3 cf::object::player 2414=head3 cf::object::player
2146 2436
2147 } else { 2437 } else {
2148 my $pl = $self->contr; 2438 my $pl = $self->contr;
2149 2439
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2442 $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 2443
2159 } else { 2444 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2162 } 2447 }
2163 } 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 (@_);
2164} 2459}
2165 2460
2166=item $player_object->may ("access") 2461=item $player_object->may ("access")
2167 2462
2168Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2250 2545
2251 $map->load; 2546 $map->load;
2252 $map->load_diag; 2547 $map->load_neighbours;
2253 2548
2254 return unless $self->contr->active; 2549 return unless $self->contr->active;
2255 $self->activate_recursive; 2550 $self->activate_recursive;
2256 2551
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2573
2279 $self->enter_link; 2574 $self->enter_link;
2280 2575
2281 (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
2282 my $map = eval { 2598 my $map = eval {
2283 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2284 2600
2285 if ($map) { 2601 if ($map) {
2286 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2288 } else { 2604 } else {
2289 $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);
2290 } 2606 }
2291 2607
2292 $map 2608 $map
2293 }; 2609 };
2294 2610
2347 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2348 } 2664 }
2349 2665
2350 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2351 2667
2352 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2353 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2355 2671
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2384 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2387 2703
2388 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2389 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2390 unless (eval { 2708 unless (eval {
2391 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2392 2710
2393 1; 2711 1;
2419 2737
2420 utf8::encode $text; 2738 utf8::encode $text;
2421 $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);
2422} 2740}
2423 2741
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2742=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2743
2426Send 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
2427client 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
2428the 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
2429the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2430 2748
2431=cut 2749=cut
2432 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
2433sub cf::client::send_msg { 2803sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2805
2436 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2437 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
2438 return unless @extra || length $msg; 2830 return unless @extra || length $msg;
2439 2831
2440 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
2441 $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]));
2442 } else { 2839 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 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
2454 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2858 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2459 } 2861 }
2460 } 2862 }
2461 } 2863 }
2462} 2864}
2463 2865
2464=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2465 2867
2466Sends an ext event to the client. 2868Sends an ext event to the client.
2467 2869
2468=cut 2870=cut
2469 2871
2470sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2472 2874
2473 return unless $self->extcmd; 2875 if ($self->extcmd == 2) {
2474 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2476 $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 }
2477} 2899}
2478 2900
2479=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2480 2902
2481Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 2958 my ($ns, $buf) = @_;
2537 2959
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2961
2540 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
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2970 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2971 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2547 } else { 2977 } else {
2548 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";
2549 } 2979 }
2550 2980
2551 cf::override; 2981 cf::override;
2598our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2600 3030
2601$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2602 3032
2603$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));
2604 3038
2605# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2606 3040
2607=pod 3041=pod
2608 3042
2609The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2610 3044
2611 cf::object 3045 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3046 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3047 insert remove name archname title slaying race decrease_ob_nr
2614 3048
2615 cf::object::player 3049 cf::object::player
2616 player 3050 player
2617 3051
2618 cf::player 3052 cf::player
2623 3057
2624=cut 3058=cut
2625 3059
2626for ( 3060for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 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
2628 insert remove)], 3063 decrease_ob_nr destroy)],
2629 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2632) { 3067) {
2633 no strict 'refs'; 3068 no strict 'refs';
2709# the server's init and main functions 3144# the server's init and main functions
2710 3145
2711sub load_facedata($) { 3146sub load_facedata($) {
2712 my ($path) = @_; 3147 my ($path) = @_;
2713 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
2714 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2715 3156
2716 my $facedata; 3157 my $facedata;
2717 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3159 or die "$path: $!";
2720 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2721 3162
2722 $facedata->{version} == 2 3163 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 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
2725 { 3173 {
2726 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2727 3175
2728 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2730 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3183
2735 cf::cede_to_tick; 3184 cf::cede_to_tick;
2736 } 3185 }
2737 3186
2738 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2740 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2741 or next; 3191 or next;
3192
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3196 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2763 3214
2764 { 3215 {
2765 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3219
2770 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3221 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
2778 3224
2779 if ($name =~ /\.jpg$/) { 3225 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3226 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 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};
2782 } else { 3240 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3241 $RESOURCE{$name} = $info;
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3242 }
2789 3243
2790 cf::cede_to_tick; 3244 cf::cede_to_tick;
2791 } 3245 }
2792 } 3246 }
2793 3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249
2794 1 3250 1
2795} 3251}
2796 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
2797sub 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
2798 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
2800 3288
2801 for (cf::region::list) { 3289 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3290 $_->{match} = qr/$_->{match}/
2838 3326
2839sub init { 3327sub init {
2840 reload_resources; 3328 reload_resources;
2841} 3329}
2842 3330
2843sub cfg_load { 3331sub reload_config {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3333 or return;
2846 3334
2847 local $/; 3335 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2849 3337
2850 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2851 3339
2852 $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};
2853 $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};
2864sub main { 3352sub main {
2865 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2866 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2867 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#
2868 (async { 3356 (async {
2869 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2870 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2871 }; 3360 };
2872 3361
2873 cfg_load; 3362 reload_config;
2874 db_init; 3363 db_init;
2875 load_extensions; 3364 load_extensions;
2876 3365
2877 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
2878 Event::loop; 3368 EV::loop;
2879} 3369}
2880 3370
2881############################################################################# 3371#############################################################################
2882# initialisation and cleanup 3372# initialisation and cleanup
2883 3373
2884# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2885BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2886 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2887 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2888 reentrant => 0,
2889 data => WF_AUTOCANCEL,
2890 signal => $signal,
2891 prio => 0,
2892 cb => sub {
2893 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
2894 },
2895 ); 3380 };
2896 } 3381 }
2897} 3382}
2898 3383
2899sub write_runtime { 3384sub write_runtime {
2900 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
2945 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
2946 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
2947 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
2948 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
2949 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950 $pl->save; 3436 $pl->save;
2951 } 3437 }
2952 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
2953 3439
2954 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
2993 warn "syncing database to disk"; 3479 warn "syncing database to disk";
2994 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
2995 3481
2996 # 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
2997 3483
2998 warn "cancelling all WF_AUTOCANCEL watchers";
2999 for (Event::all_watchers) {
3000 $_->cancel if $_->data & WF_AUTOCANCEL;
3001 }
3002
3003 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3004 for (;;) { 3485 for (;;) {
3005 BDB::flush; 3486 BDB::flush;
3006 IO::AIO::flush; 3487 IO::AIO::flush;
3007 Coro::cede; 3488 Coro::cede_notself;
3008 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3009 warn "iterate..."; 3490 warn "iterate...";
3010 } 3491 }
3011 3492
3012 ++$RELOAD; 3493 ++$RELOAD;
3071 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
3072 require cf; 3553 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3555
3075 warn "loading config and database again"; 3556 warn "loading config and database again";
3076 cf::cfg_load; 3557 cf::reload_config;
3077 3558
3078 warn "loading extensions"; 3559 warn "loading extensions";
3079 cf::load_extensions; 3560 cf::load_extensions;
3080 3561
3081 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3088 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3089 3570
3090 1 3571 1
3091 } or do { 3572 } or do {
3092 warn $@; 3573 warn $@;
3093 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3094 exit 1;
3095 }; 3575 };
3096 3576
3097 warn "reloaded"; 3577 warn "reloaded";
3098}; 3578};
3099 3579
3101 3581
3102sub reload_perl() { 3582sub reload_perl() {
3103 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3104 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3105 3585
3106 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3107 reentrant => 0,
3108 after => 0,
3109 data => WF_AUTOCANCEL,
3110 cb => sub {
3111 do_reload_perl; 3587 do_reload_perl;
3112 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3113 },
3114 ); 3589 };
3115} 3590}
3116 3591
3117register_command "reload" => sub { 3592register_command "reload" => sub {
3118 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3119 3594
3120 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3121 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3122 async { reload_perl }; 3599 reload_perl;
3600 };
3123 } 3601 }
3124}; 3602};
3125 3603
3126unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3127 3605
3129 3607
3130our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3131our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3132 3610
3133sub wait_for_tick { 3611sub wait_for_tick {
3134 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3135 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3136 3614
3137 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3138 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3139 $signal->wait; 3617 $signal->wait;
3140} 3618}
3141 3619
3142sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3143 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3144 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3145 3623
3146 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait; 3626 $signal->wait;
3149} 3627}
3150 3628
3151 my $min = 1e6;#d# 3629sub tick {
3152 my $avg = 10;
3153$TICK_WATCHER = Event->timer (
3154 reentrant => 0,
3155 parked => 1,
3156 prio => 0,
3157 at => $NEXT_TICK || $TICK,
3158 data => WF_AUTOCANCEL,
3159 cb => sub {
3160 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3161 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"
3162 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3163 return; 3633 return;
3164 } 3634 }
3165 3635
3166 $NOW = $tick_start = Event::time;
3167
3168 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3169 3637
3170 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3171 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3172 my $t = Event::time; 3640 Coro::async_pool {
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3174 or die; 3642 write_runtime
3175 3643 or warn "ERROR: unable to write runtime file: $!";
3176 $map->width (50);
3177 $map->height (50);
3178 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1);
3180 my $t = Event::time - $t;
3181
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 }; 3644 };
3645 }
3192 3646
3193 $RUNTIME += $TICK;
3194 $NEXT_TICK += $TICK;
3195
3196 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool {
3199 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!";
3201 };
3202 }
3203
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send; 3648 $sig->send;
3209 } 3649 }
3210 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3211 $sig->send; 3651 $sig->send;
3212 } 3652 }
3213 3653
3214 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3215
3216 # if we are delayed by four ticks or more, skip them all
3217 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3218
3219 $TICK_WATCHER->at ($NEXT_TICK);
3220 $TICK_WATCHER->start;
3221
3222 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224 3656
3225 _post_tick; 3657 if (0) {
3226 3658 if ($NEXT_TICK) {
3227 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3228 }, 3663 }
3229); 3664}
3230 3665
3231{ 3666{
3232 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3233 $BDB_POLL_WATCHER = Event->io ( 3668
3234 reentrant => 0,
3235 fd => BDB::poll_fileno,
3236 poll => 'r',
3237 prio => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb,
3240 );
3241 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3242 3670 BDB::max_poll_reqs $TICK * 0.1;
3243 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3244 my $status;
3245 my $current = $Coro::current;
3246 (
3247 sub {
3248 $status = $!;
3249 $current->ready; undef $current;
3250 },
3251 sub {
3252 Coro::schedule while defined $current;
3253 $! = $status;
3254 },
3255 )
3256 };
3257 3672
3258 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3259 $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);
3260 3679
3261 cf::sync_job { 3680 cf::sync_job {
3262 eval { 3681 eval {
3263 BDB::db_env_open 3682 BDB::db_env_open
3264 $DB_ENV, 3683 $DB_ENV,
3266 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
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666; 3687 0666;
3269 3688
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 }; 3690 };
3275 3691
3276 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3277 }; 3693 };
3278 } 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 };
3279} 3705}
3280 3706
3281{ 3707{
3708 # configure IO::AIO
3709
3282 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3283
3284 undef $Coro::AIO::WATCHER;
3285 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3286 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 fd => IO::AIO::poll_fileno,
3290 poll => 'r',
3291 prio => 6,
3292 cb => \&IO::AIO::poll_cb,
3293 );
3294} 3713}
3295 3714
3296my $_log_backtrace; 3715my $_log_backtrace;
3297 3716
3298sub _log_backtrace { 3717sub _log_backtrace {
3302 3721
3303 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3305 ++$_log_backtrace; 3724 ++$_log_backtrace;
3306 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3307 my @bt = fork_call { 3728 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 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 |"
3311 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines