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.287 by root, Mon Jun 25 05:43:45 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
48use JSON::XS 2.01 ();
25use BDB (); 49use BDB ();
26use Data::Dumper; 50use Data::Dumper;
27use Digest::MD5; 51use Digest::MD5;
28use Fcntl; 52use Fcntl;
29use YAML::Syck (); 53use YAML ();
30use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
31use Time::HiRes; 55use Time::HiRes;
32use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
33 58
34# configure various modules to our taste 59# configure various modules to our taste
35# 60#
36$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
38Compress::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
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44 64
45$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
46 66
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 68
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
72 93
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 97our $NEXT_TICK;
78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
80 99
81our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
82our $DB_ENV; 104our $DB_ENV;
83 105
84our %CFG; 106our %CFG;
85 107
86our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 109our $RUNTIME;
110our $NOW;
88 111
89our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
92 115
93# 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 ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 118
96our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
97our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
98our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
99 123
100binmode STDOUT; 124binmode STDOUT;
101binmode STDERR; 125binmode STDERR;
102 126
103# read virtual server time, if available 127# read virtual server time, if available
156 180
157The raw value load value from the last tick. 181The raw value load value from the last tick.
158 182
159=item %cf::CFG 183=item %cf::CFG
160 184
161Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 186from wherever your confdir points to.
163 187
164=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
165 189
166These 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
167returns 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
168per 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.
169 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
170=back 200=back
171 201
172=cut 202=cut
173 203
174BEGIN { 204BEGIN {
178 $msg .= "\n" 208 $msg .= "\n"
179 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
180 210
181 $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;
182 212
183 utf8::encode $msg;
184 LOG llevError, $msg; 213 LOG llevError, $msg;
185 }; 214 };
186} 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#?
187 231
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
204)) { 248)) {
205 no strict 'refs'; 249 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 251}
208 252
209$Event::DIED = sub { 253$EV::DIED = sub {
210 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
211}; 255};
212 256
213############################################################################# 257#############################################################################
214 258
237 $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;
238 $d 282 $d
239 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
240} 284}
241 285
242use JSON::XS ();
243
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->convert_blessed->utf8; 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 538
415sub fork_call(&@) { 539sub fork_call(&@) {
416 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
417 541
418# 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,
419# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 545
423 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 547 reset_signals;
436 local $SIG{__WARN__}; 548 &$cb
437 local $SIG{__DIE__}; 549 }, @args;
438 eval {
439 close $fh1;
440 550
441 my @res = eval { $cb->(@args) }; 551 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
447 }
448} 552}
449 553
450=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
451 555
452Returns a single value from the environment database. 556Returns a single value from the environment database.
454=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
455 559
456Stores 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
457data 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).
458 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
459=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}
460 586
461our $DB; 587our $DB;
462 588
463sub db_init { 589sub db_init {
464 unless ($DB) {
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job { 590 cf::sync_job {
468 eval { 591 $DB ||= db_table "db";
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 } 592 };
478} 593}
479 594
480sub db_get($$) { 595sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
482 597
532 if (1) { 647 if (1) {
533 $md5 = 648 $md5 =
534 join "\x00", 649 join "\x00",
535 $processversion, 650 $processversion,
536 map { 651 map {
537 Coro::cede; 652 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 654 } 0.. $#$src;
540 655
541 656
542 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
586attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
588 703
589In 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>
590C<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
591Crossfire TRT). 706Deliantra).
592 707
593=over 4 708=over 4
594 709
595=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
596 711
848 "; 963 ";
849 die if $@; 964 die if $@;
850} 965}
851 966
852our $override; 967our $override;
853our @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?
854 969
855sub override { 970sub override {
856 $override = 1; 971 $override = 1;
857 @invoke_results = (); 972 @INVOKE_RESULTS = (@_);
858} 973}
859 974
860sub do_invoke { 975sub do_invoke {
861 my $event = shift; 976 my $event = shift;
862 my $callbacks = shift; 977 my $callbacks = shift;
863 978
864 @invoke_results = (); 979 @INVOKE_RESULTS = ();
865 980
866 local $override; 981 local $override;
867 982
868 for (@$callbacks) { 983 for (@$callbacks) {
869 eval { &{$_->[1]} }; 984 eval { &{$_->[1]} };
878 } 993 }
879 994
880 0 995 0
881} 996}
882 997
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 999
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 1001
887Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
888 1003
889This 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
890removed 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
891results (if you must, access C<@cf::invoke_results> directly). 1006results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 1007
893=back 1008=back
894 1009
895=cut 1010=cut
896 1011
897############################################################################# 1012#############################################################################
898# 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}
899 1056
900sub reattach { 1057sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1059 my ($obj) = @_;
903 1060
924cf::attachable->attach ( 1081cf::attachable->attach (
925 prio => -1000000, 1082 prio => -1000000,
926 on_instantiate => sub { 1083 on_instantiate => sub {
927 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
928 1085
929 $data = from_json $data; 1086 $data = decode_json $data;
930 1087
931 for (@$data) { 1088 for (@$data) {
932 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
933 1090
934 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
950sub object_freezer_save { 1107sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
952 1109
953 sync_job { 1110 sync_job {
954 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
957 1115
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1120 close $fh;
963 1121
964 if (@$objs) { 1122 if (@$objs) {
965 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) {
966 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
970 close $fh; 1128 close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
972 } 1130 }
980 } 1138 }
981 } else { 1139 } else {
982 aio_unlink $filename; 1140 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
984 } 1142 }
985 } 1143 };
986} 1144}
987 1145
988sub object_freezer_as_string { 1146sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
990 1148
1002 or return; 1160 or return;
1003 1161
1004 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1164 or return;
1165
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1008 } 1168 }
1009 1169
1170 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1012 return ($data, $av); 1174 ($data, $av)
1013} 1175}
1014 1176
1015=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1016 1178
1017=over 4 1179=over 4
1087 cf::override; 1249 cf::override;
1088 }, 1250 },
1089 on_extcmd => sub { 1251 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1091 1253
1092 my $msg = eval { from_json $buf }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1255
1094 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
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1100 } else { 1271 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1273 }
1103 1274
1104 cf::override; 1275 cf::override;
1157 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1158 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1159 1330
1160 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1161 warn $msg; 1332 warn $msg;
1162 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1163 exit 1;
1164 } 1334 }
1165 1335
1166 warn $msg; 1336 warn $msg;
1167 } 1337 }
1168 1338
1193use Coro::AIO; 1363use Coro::AIO;
1194 1364
1195=head3 cf::player 1365=head3 cf::player
1196 1366
1197=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}
1198 1382
1199=item cf::player::find $login 1383=item cf::player::find $login
1200 1384
1201Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1202 1386
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1426
1243 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1244 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;
1245 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1246 } 1435 }
1247 } 1436 }
1248} 1437}
1249 1438
1259 1448
1260 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1262 1451
1263 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1264 Coro::cede; 1453 cf::cede_to_tick;
1265} 1454}
1266 1455
1267sub new($) { 1456sub new($) {
1268 my ($login) = @_; 1457 my ($login) = @_;
1269 1458
1273 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1274 1463
1275 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1276 1465
1277 $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 (@_);
1278} 1477}
1279 1478
1280=item $pl->quit_character 1479=item $pl->quit_character
1281 1480
1282Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1337 or return []; 1536 or return [];
1338 1537
1339 my @logins; 1538 my @logins;
1340 1539
1341 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") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1345 1549
1346 utf8::decode $login; 1550 utf8::decode $login;
1347 push @logins, $login; 1551 push @logins, $login;
1348 } 1552 }
1349 1553
1382 1586
1383Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1384 1588
1385=cut 1589=cut
1386 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
1387sub expand_cfpod { 1602sub expand_cfpod {
1388 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1389 1604
1390 # escape & and < 1605 my $xml;
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393 1606
1394 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1395 1610
1396 1 while 1611 $group =~ s/&/&amp;/g;
1397 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1398 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1399 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1400 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1401 # replace G<male|female> tags 1616 ([BCGHITU])
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1403 $self->gender ? $2 : $1 1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
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") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1404 }ge 1654 }
1405 # replace H<hint text> 1655 }
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407 1656
1657 for ($xml) {
1408 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1410 1660
1411 $_ 1661 # compress some whitespace
1412} 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 }
1413 1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677
1414=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1415 1679
1416Sends an ext reply to the player. 1680Sends an ext reply to the player.
1417 1681
1418=cut 1682=cut
1419 1683
1420sub ext_reply($$%) { 1684sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1422 1686
1423 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1688}
1426 1689
1427=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1428 1691
1429Sends an ext event to the client. 1692Sends an ext event to the client.
1430 1693
1431=cut 1694=cut
1432 1695
1433sub ext_event($$%) { 1696sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1435 1698
1436 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1437} 1700}
1438 1701
1439=head3 cf::region 1702=head3 cf::region
1440 1703
1441=over 4 1704=over 4
1454 my ($path) = @_; 1717 my ($path) = @_;
1455 1718
1456 my ($match, $specificity); 1719 my ($match, $specificity);
1457 1720
1458 for my $region (list) { 1721 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1722 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1723 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1724 if $region->specificity > $specificity;
1462 } 1725 }
1463 } 1726 }
1464 1727
1584 $self->init; # pass $1 etc. 1847 $self->init; # pass $1 etc.
1585 return $self; 1848 return $self;
1586 } 1849 }
1587 } 1850 }
1588 1851
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1852 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1853 ()
1591} 1854}
1592 1855
1593sub init { 1856sub init {
1594 my ($self) = @_; 1857 my ($self) = @_;
1657 1920
1658sub load_header_from($) { 1921sub load_header_from($) {
1659 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1660 1923
1661 utf8::encode $path; 1924 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 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;
1667 1933
1668 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1669 1935
1670 1 1936 1
1671} 1937}
1725sub find { 1991sub find {
1726 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1727 1993
1728 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1729 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1731 1998
1732 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1733 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
1734 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1735 or return; 2004 or return;
1736 2005
1737 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1738 2007
1740 or return; 2009 or return;
1741 2010
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1745 $map->reset; 2016 $map->reset;
1746 undef $guard;
1747 return find $path; 2017 return find $path;
1748 } 2018 }
1749 2019
1750 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1751 } 2021 }
1760 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1761 2031
1762 my $path = $self->{path}; 2032 my $path = $self->{path};
1763 2033
1764 { 2034 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1766 2036
2037 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 2039
1769 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1770 2041
1771 $self->alloc; 2042 $self->alloc;
1772 2043
1773 $self->pre_load; 2044 $self->pre_load;
1774 Coro::cede; 2045 cf::cede_to_tick;
1775 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1777 or return; 2050 or return;
1778 2051
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1781 2054
1782 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2056 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2059 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1787 } 2063 }
1788 } 2064 }
1789 2065
1790 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1791 # now do the right thing for maps 2069 # now do the right thing for maps
1792 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2072 unless $self->difficulty;
1795 Coro::cede; 2073 cf::cede_to_tick;
1796 2074
1797 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2076 $self->decay_objects;
1799 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1800 $self->update_buttons; 2078 $self->update_buttons;
1801 Coro::cede; 2079 cf::cede_to_tick;
1802 $self->set_darkness_map; 2080 $self->set_darkness_map;
1803 Coro::cede; 2081 cf::cede_to_tick;
1804 $self->activate; 2082 $self->activate;
1805 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1806 2087
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 2089 }
1809 2090
1810 $self->post_load; 2091 $self->post_load;
1821 2102
1822 $self 2103 $self
1823} 2104}
1824 2105
1825# 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
1826sub load_diag { 2107sub load_neighbours {
1827 my ($map) = @_; 2108 my ($map) = @_;
1828 2109
1829 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1830 2111
1831 for (0 .. 3) { 2112 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1833 or next; 2114 or next;
1834 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1835 or next; 2116 or next;
1836 $neigh->load; 2117 $neigh->load;
1837 2118
2119 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 2122 }
1841 2123
1842 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1844 or next; 2127 or next;
1845 $neigh->load; 2128 $neigh->load;
1846 } 2129 }
1847} 2130}
1848 2131
1853} 2136}
1854 2137
1855sub do_load_sync { 2138sub do_load_sync {
1856 my ($map) = @_; 2139 my ($map) = @_;
1857 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1858 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1859} 2145}
1860 2146
1861our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1863 2149
1864sub find_async { 2150sub find_async {
1865 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1866 2152
1867 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1868 2154
1869 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 2157 }
1872 2158
1873 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1874 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1875 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2166 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2167 $map->load if $v;
2168 }
1880 2169
1881 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1882 } 2171 }
1883 } 2172 }
1884 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1885 }; 2174 };
1886 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1889} 2178}
1890 2179
1891sub save { 2180sub save {
1892 my ($self) = @_; 2181 my ($self) = @_;
1893 2182
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2184
1896 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1897 2186
1898 return unless $self->dirty; 2187 return unless $self->dirty;
1899 2188
1905 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1906 2195
1907 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
1908 2197
1909 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
1911 }; 2201 };
1912 2202
1913 if ($uniq) { 2203 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1922 my ($self) = @_; 2212 my ($self) = @_;
1923 2213
1924 # save first because save cedes 2214 # save first because save cedes
1925 $self->save; 2215 $self->save;
1926 2216
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2218
1929 return if $self->players; 2219 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1932 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
1933 $self->clear; 2227 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2228}
1936 2229
1937sub reset_at { 2230sub reset_at {
1938 my ($self) = @_; 2231 my ($self) = @_;
1939 2232
1971 if $uniq; 2264 if $uniq;
1972 } 2265 }
1973 2266
1974 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
1975 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2271 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2272
1980 $self->unlink_save; 2273 $self->unlink_save;
1981 $self->destroy; 2274 $self->destroy;
1982} 2275}
1983 2276
1984my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
1985 2278
1986sub nuke { 2279sub nuke {
1987 my ($self) = @_; 2280 my ($self) = @_;
1988 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
1989 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
1990 2286
1991 $self->unlink_save; 2287 $self->unlink_save;
1992 2288
1993 bless $self, "cf::map"; 2289 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2294
1999 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2000 2297
2001 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2002} 2299}
2003 2300
2004=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2080 2377
2081sub inv_recursive { 2378sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2083} 2380}
2084 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
2085package cf; 2410package cf;
2086 2411
2087=back 2412=back
2088 2413
2089=head3 cf::object::player 2414=head3 cf::object::player
2111 2436
2112 } else { 2437 } else {
2113 my $pl = $self->contr; 2438 my $pl = $self->contr;
2114 2439
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2443
2124 } else { 2444 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2127 } 2447 }
2128 } 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 (@_);
2129} 2459}
2130 2460
2131=item $player_object->may ("access") 2461=item $player_object->may ("access")
2132 2462
2133Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2212 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2215 2545
2216 $map->load; 2546 $map->load;
2217 $map->load_diag; 2547 $map->load_neighbours;
2218 2548
2219 return unless $self->contr->active; 2549 return unless $self->contr->active;
2220 $self->activate_recursive; 2550 $self->activate_recursive;
2221 2551
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2553 $self->enter_map ($map, $x, $y);
2224} 2554}
2225 2555
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2557
2228Moves 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
2229her, loading and preparing them map, calling the provided $check callback 2559her, loading and preparing them map, calling the provided $check callback
2230that 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
2231the 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.
2232 2563
2233=cut 2564=cut
2234 2565
2235our $GOTOGEN; 2566our $GOTOGEN;
2236 2567
2237sub cf::object::player::goto { 2568sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2569 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2570
2240 # 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
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2573
2243 $self->enter_link; 2574 $self->enter_link;
2244 2575
2245 (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
2246 my $map = eval { 2598 my $map = eval {
2247 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2248 2600
2249 if ($map) { 2601 if ($map) {
2250 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2252 } else { 2604 } else {
2253 $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);
2254 } 2606 }
2255 2607
2256 $map 2608 $map
2257 }; 2609 };
2258 2610
2263 2615
2264 if ($gen == $self->{_goto_generation}) { 2616 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2617 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2618 $self->leave_link ($map, $x, $y);
2267 } 2619 }
2620
2621 $done->() if $done;
2268 })->prio (1); 2622 })->prio (1);
2269} 2623}
2270 2624
2271=item $player_object->enter_exit ($exit_object) 2625=item $player_object->enter_exit ($exit_object)
2272 2626
2309 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2310 } 2664 }
2311 2665
2312 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2313 2667
2314 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2315 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2317 2671
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2341 my $hp = $exit->stats->hp; 2695 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2696 my $sp = $exit->stats->sp;
2343 2697
2344 $self->enter_link; 2698 $self->enter_link;
2345 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
2346 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2347 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2708 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2350 2710
2351 1; 2711 1;
2377 2737
2378 utf8::encode $text; 2738 utf8::encode $text;
2379 $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);
2380} 2740}
2381 2741
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2742=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2743
2384Send 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
2385client 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
2386the 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
2387the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2388 2748
2389=cut 2749=cut
2390 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
2391sub cf::client::send_msg { 2803sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2805
2394 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2395 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
2396 if ($self->can_msg) { 2832 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2833 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF;
2836
2837 $self->send_packet ("msg " . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2839 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 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
2410 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2858 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2415 } 2861 }
2416 } 2862 }
2417 } 2863 }
2418} 2864}
2419 2865
2420=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2421 2867
2422Sends an ext event to the client. 2868Sends an ext event to the client.
2423 2869
2424=cut 2870=cut
2425 2871
2426sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2428 2874
2875 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%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 }
2431} 2899}
2432 2900
2433=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2434 2902
2435Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2458 2926
2459 1 2927 1
2460} 2928}
2461 2929
2462cf::client->attach ( 2930cf::client->attach (
2931 on_connect => sub {
2932 my ($ns) = @_;
2933
2934 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2935 },
2463 on_reply => sub { 2936 on_reply => sub {
2464 my ($ns, $msg) = @_; 2937 my ($ns, $msg) = @_;
2465 2938
2466 # this weird shuffling is so that direct followup queries 2939 # this weird shuffling is so that direct followup queries
2467 # get handled first 2940 # get handled first
2482 } 2955 }
2483 }, 2956 },
2484 on_exticmd => sub { 2957 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2958 my ($ns, $buf) = @_;
2486 2959
2487 my $msg = eval { from_json $buf }; 2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2961
2489 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
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2970 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2971 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2496 } else { 2977 } else {
2497 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";
2498 } 2979 }
2499 2980
2500 cf::override; 2981 cf::override;
2547our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2549 3030
2550$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2551 3032
2552$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));
2553 3038
2554# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2555 3040
2556=pod 3041=pod
2557 3042
2558The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2559 3044
2560 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
2561 cf::object::player player 3049 cf::object::player
2562 cf::player peaceful 3050 player
2563 cf::map trigger 3051
3052 cf::player
3053 peaceful
3054
3055 cf::map
3056 trigger
2564 3057
2565=cut 3058=cut
2566 3059
2567for ( 3060for (
2568 ["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)],
2569 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2572) { 3067) {
2573 no strict 'refs'; 3068 no strict 'refs';
2649# the server's init and main functions 3144# the server's init and main functions
2650 3145
2651sub load_facedata($) { 3146sub load_facedata($) {
2652 my ($path) = @_; 3147 my ($path) = @_;
2653 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
2654 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2655 3156
2656 my $facedata; 3157 my $facedata;
2657 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 3159 or die "$path: $!";
2660 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2661 3162
2662 $facedata->{version} == 2 3163 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 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
2665 { 3173 {
2666 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2667 3175
2668 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3179 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 3183
3184 cf::cede_to_tick;
2674 } 3185 }
2675 3186
2676 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2678 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2679 or next; 3191 or next;
3192
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3196 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3198 }
2685 Coro::cede; 3199
3200 cf::cede_to_tick;
2686 } 3201 }
2687 } 3202 }
2688 3203
2689 { 3204 {
2690 my $anims = $facedata->{animinfo}; 3205 my $anims = $facedata->{animinfo};
2691 3206
2692 while (my ($anim, $info) = each %$anims) { 3207 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3208 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3209 cf::cede_to_tick;
2695 } 3210 }
2696 3211
2697 cf::anim::invalidate_all; # d'oh 3212 cf::anim::invalidate_all; # d'oh
2698 } 3213 }
2699 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
2700 1 3250 1
2701} 3251}
2702 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
2703sub 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
2704 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2705 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 }
2706} 3293}
2707 3294
2708sub reload_facedata { 3295sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3296 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3297 or die "unable to load facedata\n";
2711} 3298}
2712 3299
2713sub reload_archetypes { 3300sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 3306 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 3307 or die "unable to load archetypes\n";
2716} 3308}
2717 3309
2718sub reload_treasures { 3310sub reload_treasures {
2734 3326
2735sub init { 3327sub init {
2736 reload_resources; 3328 reload_resources;
2737} 3329}
2738 3330
2739sub cfg_load { 3331sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3333 or return;
2742 3334
2743 local $/; 3335 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2745 3337
2746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2747 3339
2748 $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};
2749 $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};
2760sub main { 3352sub main {
2761 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2763 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#
2764 (async { 3356 (async {
2765 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2767 }; 3360 };
2768 3361
2769 cfg_load; 3362 reload_config;
2770 db_init; 3363 db_init;
2771 load_extensions; 3364 load_extensions;
2772 3365
2773 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
2774 Event::loop; 3368 EV::loop;
2775} 3369}
2776 3370
2777############################################################################# 3371#############################################################################
2778# initialisation and cleanup 3372# initialisation and cleanup
2779 3373
2780# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2781BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
2790 },
2791 ); 3380 };
2792 } 3381 }
2793} 3382}
2794 3383
2795sub write_runtime { 3384sub write_runtime {
2796 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
2841 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
2843 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3436 $pl->save;
2847 } 3437 }
2848 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
2849 3439
2850 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
2889 warn "syncing database to disk"; 3479 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
2891 3481
2892 # 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
2893 3483
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898
2899 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
2900 for (;;) { 3485 for (;;) {
2901 BDB::flush; 3486 BDB::flush;
2902 IO::AIO::flush; 3487 IO::AIO::flush;
2903 Coro::cede; 3488 Coro::cede_notself;
2904 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
2905 warn "iterate..."; 3490 warn "iterate...";
2906 } 3491 }
2907 3492
2908 ++$RELOAD; 3493 ++$RELOAD;
2967 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
2968 require cf; 3553 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3555
2971 warn "loading config and database again"; 3556 warn "loading config and database again";
2972 cf::cfg_load; 3557 cf::reload_config;
2973 3558
2974 warn "loading extensions"; 3559 warn "loading extensions";
2975 cf::load_extensions; 3560 cf::load_extensions;
2976 3561
2977 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
2984 warn "leaving sync_job"; 3569 warn "leaving sync_job";
2985 3570
2986 1 3571 1
2987 } or do { 3572 } or do {
2988 warn $@; 3573 warn $@;
2989 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
2990 exit 1;
2991 }; 3575 };
2992 3576
2993 warn "reloaded"; 3577 warn "reloaded";
2994}; 3578};
2995 3579
2997 3581
2998sub reload_perl() { 3582sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3001 3585
3002 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3003 reentrant => 0,
3004 after => 0,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 do_reload_perl; 3587 do_reload_perl;
3008 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3009 },
3010 ); 3589 };
3011} 3590}
3012 3591
3013register_command "reload" => sub { 3592register_command "reload" => sub {
3014 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3015 3594
3016 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 3599 reload_perl;
3600 };
3019 } 3601 }
3020}; 3602};
3021 3603
3022unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3023 3605
3025 3607
3026our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3027our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3028 3610
3029sub wait_for_tick { 3611sub wait_for_tick {
3030 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3031 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3032 3614
3033 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3034 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3035 $signal->wait; 3617 $signal->wait;
3036} 3618}
3037 3619
3038sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3039 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3040 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3041 3623
3042 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 3626 $signal->wait;
3045} 3627}
3046 3628
3047 my $min = 1e6;#d# 3629sub tick {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3057 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"
3058 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3059 return; 3633 return;
3060 } 3634 }
3061 3635
3062 $NOW = $tick_start = Event::time;
3063
3064 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3065 3637
3066 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3067 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3068 my $t = Event::time; 3640 Coro::async_pool {
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3070 or die; 3642 write_runtime
3071 3643 or warn "ERROR: unable to write runtime file: $!";
3072 $map->width (50);
3073 $map->height (50);
3074 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1);
3076 my $t = Event::time - $t;
3077
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 3644 };
3645 }
3088 3646
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 3648 $sig->send;
3105 } 3649 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send; 3651 $sig->send;
3108 } 3652 }
3109 3653
3110 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 3656
3121 _post_tick; 3657 if (0) {
3122 3658 if ($NEXT_TICK) {
3123 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3124 }, 3663 }
3125); 3664}
3126 3665
3127{ 3666{
3128 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 3668
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3138 3670 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 3672
3154 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3155 $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);
3156 3679
3157 cf::sync_job { 3680 cf::sync_job {
3158 eval { 3681 eval {
3159 BDB::db_env_open 3682 BDB::db_env_open
3160 $DB_ENV, 3683 $DB_ENV,
3162 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
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 3687 0666;
3165 3688
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 3690 };
3171 3691
3172 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 3693 };
3174 } 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 };
3175} 3705}
3176 3706
3177{ 3707{
3708 # configure IO::AIO
3709
3178 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 3713}
3191 3714
3192my $_log_backtrace; 3715my $_log_backtrace;
3193 3716
3194sub _log_backtrace { 3717sub _log_backtrace {
3198 3721
3199 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace; 3724 ++$_log_backtrace;
3202 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3203 my @bt = fork_call { 3728 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 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 |"
3207 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines