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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.414 by root, Thu Apr 10 09:10:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
34 58
35# configure various modules to our taste 59# configure various modules to our taste
36# 60#
37$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 104our $DB_ENV;
84 105
85our %CFG; 106our %CFG;
86 107
87our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 109our $RUNTIME;
110our $NOW;
89 111
90our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
93 115
94# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 118
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
100 123
101binmode STDOUT; 124binmode STDOUT;
102binmode STDERR; 125binmode STDERR;
103 126
104# read virtual server time, if available 127# read virtual server time, if available
157 180
158The raw value load value from the last tick. 181The raw value load value from the last tick.
159 182
160=item %cf::CFG 183=item %cf::CFG
161 184
162Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 186from wherever your confdir points to.
164 187
165=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
166 189
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
171=back 200=back
172 201
173=cut 202=cut
174 203
175BEGIN { 204BEGIN {
179 $msg .= "\n" 208 $msg .= "\n"
180 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
181 210
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 212
184 utf8::encode $msg;
185 LOG llevError, $msg; 213 LOG llevError, $msg;
186 }; 214 };
187} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
188 231
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 248)) {
206 no strict 'refs'; 249 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 251}
209 252
210$Event::DIED = sub { 253$EV::DIED = sub {
211 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
212}; 255};
213 256
214############################################################################# 257#############################################################################
215 258
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 282 $d
240 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
241} 284}
242 285
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
250 293
251=cut 294=cut
252 295
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 297
255sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
257 300
258=item cf::lock_wait $string 301=item cf::lock_wait $string
259 302
260Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
261 304
264Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
267returned. 310returned.
268 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
269Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
271 317
272=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
273 319
274Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
275 321
276=cut 322=cut
277 323
278our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
279 326
280sub lock_wait($) { 327sub lock_wait($) {
281 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
282 334
283 # wait for lock, if any 335 # wait for lock, if any
284 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 338 Coro::schedule;
292 344
293 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
294 lock_wait $key; 346 lock_wait $key;
295 347
296 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
297 350
298 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
301 } 355 }
302} 356}
303 357
306 360
307 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
308} 362}
309 363
310sub freeze_mainloop { 364sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
312 366
313 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
314 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
315 }; 428 }
316 $TICK_WATCHER->stop; 429};
317 $guard 430
431sub get_slot($;$$) {
432 my ($time, $pri, $name) = @_;
433
434 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal;
436
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready;
440 $sig->wait;
318} 441}
319 442
320=item cf::async { BLOCK } 443=item cf::async { BLOCK }
321 444
322Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
327 450
328BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
329 452
330=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
331 454
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 458acceptable.
336 459
337If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
343 466
344sub sync_job(&) { 467sub sync_job(&) {
345 my ($job) = @_; 468 my ($job) = @_;
346 469
347 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 471 my $time = EV::time;
349 472
350 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
352 475
353 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 477
355 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
356 479
357 my $busy = 1; 480 my $busy = 1;
358 my @res; 481 my @res;
359 482
360 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 485 @res = eval { $job->() };
362 warn $@ if $@; 486 warn $@ if $@;
363 undef $busy; 487 undef $busy;
364 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
365 489
366 while ($busy) { 490 while ($busy) {
367 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
368 } 495 }
496 }
369 497
370 $time = Event::time - $time; 498 my $time = EV::time - $time;
371 499
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
376 501
377 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
378 } else { 503 } else {
379 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
380 505
405=item fork_call { }, $args 530=item fork_call { }, $args
406 531
407Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
411 536
412=cut 537=cut
413 538
414sub fork_call(&@) { 539sub fork_call(&@) {
415 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
416 541
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 545
422 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$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 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 550
443 my @res = eval { $cb->(@args) }; 551 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 552}
461 553
462=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
463 555
464Returns a single value from the environment database. 556Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
467 559
468Stores 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
469data 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).
470 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
471=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}
472 586
473our $DB; 587our $DB;
474 588
475sub db_init { 589sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 590 cf::sync_job {
480 eval { 591 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 592 };
490} 593}
491 594
492sub db_get($$) { 595sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
494 597
544 if (1) { 647 if (1) {
545 $md5 = 648 $md5 =
546 join "\x00", 649 join "\x00",
547 $processversion, 650 $processversion,
548 map { 651 map {
549 Coro::cede; 652 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 654 } 0.. $#$src;
552 655
553 656
554 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
598attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
600 703
601In 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>
602C<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
603Crossfire TRT). 706Deliantra).
604 707
605=over 4 708=over 4
606 709
607=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
608 711
860 "; 963 ";
861 die if $@; 964 die if $@;
862} 965}
863 966
864our $override; 967our $override;
865our @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?
866 969
867sub override { 970sub override {
868 $override = 1; 971 $override = 1;
869 @invoke_results = (); 972 @INVOKE_RESULTS = (@_);
870} 973}
871 974
872sub do_invoke { 975sub do_invoke {
873 my $event = shift; 976 my $event = shift;
874 my $callbacks = shift; 977 my $callbacks = shift;
875 978
876 @invoke_results = (); 979 @INVOKE_RESULTS = ();
877 980
878 local $override; 981 local $override;
879 982
880 for (@$callbacks) { 983 for (@$callbacks) {
881 eval { &{$_->[1]} }; 984 eval { &{$_->[1]} };
890 } 993 }
891 994
892 0 995 0
893} 996}
894 997
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 999
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1001
899Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
900 1003
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 1006results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1007
905=back 1008=back
906 1009
907=cut 1010=cut
908 1011
909############################################################################# 1012#############################################################################
910# 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}
911 1056
912sub reattach { 1057sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1059 my ($obj) = @_;
915 1060
936cf::attachable->attach ( 1081cf::attachable->attach (
937 prio => -1000000, 1082 prio => -1000000,
938 on_instantiate => sub { 1083 on_instantiate => sub {
939 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
940 1085
941 $data = from_json $data; 1086 $data = decode_json $data;
942 1087
943 for (@$data) { 1088 for (@$data) {
944 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
945 1090
946 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1107sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
964 1109
965 sync_job { 1110 sync_job {
966 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
969 1115
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
974 close $fh; 1120 close $fh;
975 1121
976 if (@$objs) { 1122 if (@$objs) {
977 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) {
978 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
981 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
982 close $fh; 1128 close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
984 } 1130 }
992 } 1138 }
993 } else { 1139 } else {
994 aio_unlink $filename; 1140 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
996 } 1142 }
997 } 1143 };
998} 1144}
999 1145
1000sub object_freezer_as_string { 1146sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1002 1148
1014 or return; 1160 or return;
1015 1161
1016 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1164 or return;
1165
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1020 } 1168 }
1021 1169
1170 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1024 return ($data, $av); 1174 ($data, $av)
1025} 1175}
1026 1176
1027=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1028 1178
1029=over 4 1179=over 4
1102 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1103 1253
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1255
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1112 } else { 1271 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1273 }
1115 1274
1116 cf::override; 1275 cf::override;
1169 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1170 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1171 1330
1172 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1173 warn $msg; 1332 warn $msg;
1174 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1175 exit 1;
1176 } 1334 }
1177 1335
1178 warn $msg; 1336 warn $msg;
1179 } 1337 }
1180 1338
1205use Coro::AIO; 1363use Coro::AIO;
1206 1364
1207=head3 cf::player 1365=head3 cf::player
1208 1366
1209=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}
1210 1382
1211=item cf::player::find $login 1383=item cf::player::find $login
1212 1384
1213Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1214 1386
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1426
1255 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1258 } 1435 }
1259 } 1436 }
1260} 1437}
1261 1438
1271 1448
1272 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1274 1451
1275 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1276 Coro::cede; 1453 cf::cede_to_tick;
1277} 1454}
1278 1455
1279sub new($) { 1456sub new($) {
1280 my ($login) = @_; 1457 my ($login) = @_;
1281 1458
1285 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1286 1463
1287 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1288 1465
1289 $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 (@_);
1290} 1477}
1291 1478
1292=item $pl->quit_character 1479=item $pl->quit_character
1293 1480
1294Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1349 or return []; 1536 or return [];
1350 1537
1351 my @logins; 1538 my @logins;
1352 1539
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1357 1549
1358 utf8::decode $login; 1550 utf8::decode $login;
1359 push @logins, $login; 1551 push @logins, $login;
1360 } 1552 }
1361 1553
1394 1586
1395Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1396 1588
1397=cut 1589=cut
1398 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
1399sub expand_cfpod { 1602sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1401 1604
1402 # escape & and < 1605 my $xml;
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405 1606
1406 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1407 1610
1408 1 while 1611 $group =~ s/&/&amp;/g;
1409 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1413 # replace G<male|female> tags 1616 ([BCGHITU])
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1415 $self->gender ? $2 : $1 1618 (?:
1416 }ge 1619 ([^<>]*) (?{ $group = $^N })
1417 # replace H<hint text> 1620 | < $interior >
1418 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1419 { 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") {
1420 ("<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>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "") 1644 "")
1423 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1424 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1425 1656
1657 for ($xml) {
1426 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1428 1660
1429 # compress some whitespace 1661 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1434 1667
1435 $_ 1668 $xml
1436} 1669}
1670
1671no re 'eval';
1437 1672
1438sub hintmode { 1673sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1675 $_[0]{hintmode}
1441} 1676}
1442 1677
1443=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1444 1679
1445Sends an ext reply to the player. 1680Sends an ext reply to the player.
1446 1681
1447=cut 1682=cut
1448 1683
1449sub ext_reply($$%) { 1684sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1451 1686
1452 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1688}
1455 1689
1456=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1457 1691
1458Sends an ext event to the client. 1692Sends an ext event to the client.
1459 1693
1460=cut 1694=cut
1461 1695
1462sub ext_event($$%) { 1696sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1464 1698
1465 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1466} 1700}
1467 1701
1468=head3 cf::region 1702=head3 cf::region
1469 1703
1470=over 4 1704=over 4
1483 my ($path) = @_; 1717 my ($path) = @_;
1484 1718
1485 my ($match, $specificity); 1719 my ($match, $specificity);
1486 1720
1487 for my $region (list) { 1721 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1722 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1723 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1724 if $region->specificity > $specificity;
1491 } 1725 }
1492 } 1726 }
1493 1727
1613 $self->init; # pass $1 etc. 1847 $self->init; # pass $1 etc.
1614 return $self; 1848 return $self;
1615 } 1849 }
1616 } 1850 }
1617 1851
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1852 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1853 ()
1620} 1854}
1621 1855
1622sub init { 1856sub init {
1623 my ($self) = @_; 1857 my ($self) = @_;
1686 1920
1687sub load_header_from($) { 1921sub load_header_from($) {
1688 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1689 1923
1690 utf8::encode $path; 1924 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 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;
1696 1933
1697 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1698 1935
1699 1 1936 1
1700} 1937}
1754sub find { 1991sub find {
1755 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1756 1993
1757 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1758 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1760 1998
1761 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1762 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
1763 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1764 or return; 2004 or return;
1765 2005
1766 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1767 2007
1769 or return; 2009 or return;
1770 2010
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1774 $map->reset; 2016 $map->reset;
1775 undef $guard;
1776 return find $path; 2017 return find $path;
1777 } 2018 }
1778 2019
1779 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1780 } 2021 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1790 2031
1791 my $path = $self->{path}; 2032 my $path = $self->{path};
1792 2033
1793 { 2034 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1795 2036
2037 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2039
1798 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1799 2041
1800 $self->alloc; 2042 $self->alloc;
1801 2043
1802 $self->pre_load; 2044 $self->pre_load;
1803 Coro::cede; 2045 cf::cede_to_tick;
1804 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1806 or return; 2050 or return;
1807 2051
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1810 2054
1811 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2056 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2059 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1816 } 2063 }
1817 } 2064 }
1818 2065
1819 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1820 # now do the right thing for maps 2069 # now do the right thing for maps
1821 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2072 unless $self->difficulty;
1824 Coro::cede; 2073 cf::cede_to_tick;
1825 2074
1826 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2076 $self->decay_objects;
1828 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1829 $self->update_buttons; 2078 $self->update_buttons;
1830 Coro::cede; 2079 cf::cede_to_tick;
1831 $self->set_darkness_map; 2080 $self->set_darkness_map;
1832 Coro::cede; 2081 cf::cede_to_tick;
1833 $self->activate; 2082 $self->activate;
1834 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1835 2087
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 2089 }
1838 2090
1839 $self->post_load; 2091 $self->post_load;
1850 2102
1851 $self 2103 $self
1852} 2104}
1853 2105
1854# 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
1855sub load_diag { 2107sub load_neighbours {
1856 my ($map) = @_; 2108 my ($map) = @_;
1857 2109
1858 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1859 2111
1860 for (0 .. 3) { 2112 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1862 or next; 2114 or next;
1863 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1864 or next; 2116 or next;
1865 $neigh->load; 2117 $neigh->load;
1866 2118
2119 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2122 }
1870 2123
1871 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1873 or next; 2127 or next;
1874 $neigh->load; 2128 $neigh->load;
1875 } 2129 }
1876} 2130}
1877 2131
1882} 2136}
1883 2137
1884sub do_load_sync { 2138sub do_load_sync {
1885 my ($map) = @_; 2139 my ($map) = @_;
1886 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1887 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1888} 2145}
1889 2146
1890our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1892 2149
1893sub find_async { 2150sub find_async {
1894 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1895 2152
1896 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1897 2154
1898 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2157 }
1901 2158
1902 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1903 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1904 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2166 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2167 $map->load if $v;
2168 }
1909 2169
1910 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1911 } 2171 }
1912 } 2172 }
1913 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1914 }; 2174 };
1915 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1918} 2178}
1919 2179
1920sub save { 2180sub save {
1921 my ($self) = @_; 2181 my ($self) = @_;
1922 2182
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2184
1925 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
1926 2186
1927 return unless $self->dirty; 2187 return unless $self->dirty;
1928 2188
1934 return if $self->{deny_save}; 2194 return if $self->{deny_save};
1935 2195
1936 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
1937 2197
1938 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
1940 }; 2201 };
1941 2202
1942 if ($uniq) { 2203 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1951 my ($self) = @_; 2212 my ($self) = @_;
1952 2213
1953 # save first because save cedes 2214 # save first because save cedes
1954 $self->save; 2215 $self->save;
1955 2216
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2218
1958 return if $self->players; 2219 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1961 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2227 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2228}
1965 2229
1966sub reset_at { 2230sub reset_at {
1967 my ($self) = @_; 2231 my ($self) = @_;
1968 2232
2000 if $uniq; 2264 if $uniq;
2001 } 2265 }
2002 2266
2003 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2004 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2271 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2272
2009 $self->unlink_save; 2273 $self->unlink_save;
2010 $self->destroy; 2274 $self->destroy;
2011} 2275}
2012 2276
2013my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
2014 2278
2015sub nuke { 2279sub nuke {
2016 my ($self) = @_; 2280 my ($self) = @_;
2017 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2018 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2019 2286
2020 $self->unlink_save; 2287 $self->unlink_save;
2021 2288
2022 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2294
2028 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2029 2297
2030 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2031} 2299}
2032 2300
2033=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2109 2377
2110sub inv_recursive { 2378sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2112} 2380}
2113 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
2114package cf; 2410package cf;
2115 2411
2116=back 2412=back
2117 2413
2118=head3 cf::object::player 2414=head3 cf::object::player
2140 2436
2141 } else { 2437 } else {
2142 my $pl = $self->contr; 2438 my $pl = $self->contr;
2143 2439
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2443
2153 } else { 2444 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2156 } 2447 }
2157 } 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 (@_);
2158} 2459}
2159 2460
2160=item $player_object->may ("access") 2461=item $player_object->may ("access")
2161 2462
2162Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2244 2545
2245 $map->load; 2546 $map->load;
2246 $map->load_diag; 2547 $map->load_neighbours;
2247 2548
2248 return unless $self->contr->active; 2549 return unless $self->contr->active;
2249 $self->activate_recursive; 2550 $self->activate_recursive;
2250 2551
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2553 $self->enter_map ($map, $x, $y);
2253} 2554}
2254 2555
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2557
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2559her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2563
2262=cut 2564=cut
2263 2565
2264our $GOTOGEN; 2566our $GOTOGEN;
2265 2567
2266sub cf::object::player::goto { 2568sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2569 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2570
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2573
2272 $self->enter_link; 2574 $self->enter_link;
2273 2575
2274 (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
2275 my $map = eval { 2598 my $map = eval {
2276 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2277 2600
2278 if ($map) { 2601 if ($map) {
2279 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2281 } else { 2604 } else {
2282 $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);
2283 } 2606 }
2284 2607
2285 $map 2608 $map
2286 }; 2609 };
2287 2610
2292 2615
2293 if ($gen == $self->{_goto_generation}) { 2616 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2617 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2618 $self->leave_link ($map, $x, $y);
2296 } 2619 }
2620
2621 $done->() if $done;
2297 })->prio (1); 2622 })->prio (1);
2298} 2623}
2299 2624
2300=item $player_object->enter_exit ($exit_object) 2625=item $player_object->enter_exit ($exit_object)
2301 2626
2338 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2339 } 2664 }
2340 2665
2341 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2342 2667
2343 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2344 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2346 2671
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2375 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2378 2703
2379 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2380 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2381 unless (eval { 2708 unless (eval {
2382 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2383 2710
2384 1; 2711 1;
2410 2737
2411 utf8::encode $text; 2738 utf8::encode $text;
2412 $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);
2413} 2740}
2414 2741
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2742=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2743
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2421 2748
2422=cut 2749=cut
2423 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
2424sub cf::client::send_msg { 2803sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2805
2427 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2830 return unless @extra || length $msg;
2430 2831
2431 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
2432 $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]));
2433 } else { 2839 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 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
2445 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2858 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2450 } 2861 }
2451 } 2862 }
2452 } 2863 }
2453} 2864}
2454 2865
2455=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2456 2867
2457Sends an ext event to the client. 2868Sends an ext event to the client.
2458 2869
2459=cut 2870=cut
2460 2871
2461sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2463 2874
2875 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 2899}
2467 2900
2468=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2469 2902
2470Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 2958 my ($ns, $buf) = @_;
2526 2959
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2961
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2970 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2971 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2536 } else { 2977 } else {
2537 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";
2538 } 2979 }
2539 2980
2540 cf::override; 2981 cf::override;
2587our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2589 3030
2590$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2591 3032
2592$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));
2593 3038
2594# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2595 3040
2596=pod 3041=pod
2597 3042
2598The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2599 3044
2600 cf::object 3045 cf::object
2601 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
2602 insert remove 3047 insert remove name archname title slaying race decrease_ob_nr
2603 3048
2604 cf::object::player 3049 cf::object::player
2605 player 3050 player
2606 3051
2607 cf::player 3052 cf::player
2612 3057
2613=cut 3058=cut
2614 3059
2615for ( 3060for (
2616 ["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
2617 insert remove)], 3063 decrease_ob_nr destroy)],
2618 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2621) { 3067) {
2622 no strict 'refs'; 3068 no strict 'refs';
2698# the server's init and main functions 3144# the server's init and main functions
2699 3145
2700sub load_facedata($) { 3146sub load_facedata($) {
2701 my ($path) = @_; 3147 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2704 3156
2705 my $facedata; 3157 my $facedata;
2706 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3159 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2710 3162
2711 $facedata->{version} == 2 3163 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 3173 {
2715 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2716 3175
2717 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3179 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3183
3184 cf::cede_to_tick;
2723 } 3185 }
2724 3186
2725 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2727 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2728 or next; 3191 or next;
3192
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3196 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3198 }
2734 Coro::cede; 3199
3200 cf::cede_to_tick;
2735 } 3201 }
2736 } 3202 }
2737 3203
2738 { 3204 {
2739 my $anims = $facedata->{animinfo}; 3205 my $anims = $facedata->{animinfo};
2740 3206
2741 while (my ($anim, $info) = each %$anims) { 3207 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3208 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3209 cf::cede_to_tick;
2744 } 3210 }
2745 3211
2746 cf::anim::invalidate_all; # d'oh 3212 cf::anim::invalidate_all; # d'oh
2747 } 3213 }
2748 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
2749 1 3250 1
2750} 3251}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2754 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 }
2755} 3293}
2756 3294
2757sub reload_facedata { 3295sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3296 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3297 or die "unable to load facedata\n";
2788 3326
2789sub init { 3327sub init {
2790 reload_resources; 3328 reload_resources;
2791} 3329}
2792 3330
2793sub cfg_load { 3331sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3333 or return;
2796 3334
2797 local $/; 3335 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2799 3337
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2801 3339
2802 $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};
2803 $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};
2814sub main { 3352sub main {
2815 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2817 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#
2818 (async { 3356 (async {
2819 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2821 }; 3360 };
2822 3361
2823 cfg_load; 3362 reload_config;
2824 db_init; 3363 db_init;
2825 load_extensions; 3364 load_extensions;
2826 3365
2827 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
2828 Event::loop; 3368 EV::loop;
2829} 3369}
2830 3370
2831############################################################################# 3371#############################################################################
2832# initialisation and cleanup 3372# initialisation and cleanup
2833 3373
2834# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2835BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
2844 },
2845 ); 3380 };
2846 } 3381 }
2847} 3382}
2848 3383
2849sub write_runtime { 3384sub write_runtime {
2850 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
2895 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
2897 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3436 $pl->save;
2901 } 3437 }
2902 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
2903 3439
2904 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
2943 warn "syncing database to disk"; 3479 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3481
2946 # 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
2947 3483
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952
2953 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
2954 for (;;) { 3485 for (;;) {
2955 BDB::flush; 3486 BDB::flush;
2956 IO::AIO::flush; 3487 IO::AIO::flush;
2957 Coro::cede; 3488 Coro::cede_notself;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
2959 warn "iterate..."; 3490 warn "iterate...";
2960 } 3491 }
2961 3492
2962 ++$RELOAD; 3493 ++$RELOAD;
3021 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
3022 require cf; 3553 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3555
3025 warn "loading config and database again"; 3556 warn "loading config and database again";
3026 cf::cfg_load; 3557 cf::reload_config;
3027 3558
3028 warn "loading extensions"; 3559 warn "loading extensions";
3029 cf::load_extensions; 3560 cf::load_extensions;
3030 3561
3031 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3038 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3039 3570
3040 1 3571 1
3041 } or do { 3572 } or do {
3042 warn $@; 3573 warn $@;
3043 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3044 exit 1;
3045 }; 3575 };
3046 3576
3047 warn "reloaded"; 3577 warn "reloaded";
3048}; 3578};
3049 3579
3051 3581
3052sub reload_perl() { 3582sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3055 3585
3056 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3057 reentrant => 0,
3058 after => 0,
3059 data => WF_AUTOCANCEL,
3060 cb => sub {
3061 do_reload_perl; 3587 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3063 },
3064 ); 3589 };
3065} 3590}
3066 3591
3067register_command "reload" => sub { 3592register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3069 3594
3070 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3599 reload_perl;
3600 };
3073 } 3601 }
3074}; 3602};
3075 3603
3076unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3077 3605
3079 3607
3080our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3082 3610
3083sub wait_for_tick { 3611sub wait_for_tick {
3084 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3085 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3086 3614
3087 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait; 3617 $signal->wait;
3090} 3618}
3091 3619
3092sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3093 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3094 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3095 3623
3096 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3626 $signal->wait;
3099} 3627}
3100 3628
3101 my $min = 1e6;#d# 3629sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3111 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"
3112 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3113 return; 3633 return;
3114 } 3634 }
3115 3635
3116 $NOW = $tick_start = Event::time;
3117
3118 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3119 3637
3120 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3122 my $t = Event::time; 3640 Coro::async_pool {
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3124 or die; 3642 write_runtime
3125 3643 or warn "ERROR: unable to write runtime file: $!";
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3644 };
3645 }
3142 3646
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3648 $sig->send;
3159 } 3649 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3651 $sig->send;
3162 } 3652 }
3163 3653
3164 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3656
3175 _post_tick; 3657 if (0) {
3176 3658 if ($NEXT_TICK) {
3177 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3178 }, 3663 }
3179); 3664}
3180 3665
3181{ 3666{
3182 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3668
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3192 3670 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3672
3208 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3209 $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);
3210 3679
3211 cf::sync_job { 3680 cf::sync_job {
3212 eval { 3681 eval {
3213 BDB::db_env_open 3682 BDB::db_env_open
3214 $DB_ENV, 3683 $DB_ENV,
3216 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
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3687 0666;
3219 3688
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3690 };
3225 3691
3226 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3693 };
3228 } 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 };
3229} 3705}
3230 3706
3231{ 3707{
3708 # configure IO::AIO
3709
3232 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3713}
3245 3714
3246my $_log_backtrace; 3715my $_log_backtrace;
3247 3716
3248sub _log_backtrace { 3717sub _log_backtrace {
3252 3721
3253 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3724 ++$_log_backtrace;
3256 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3257 my @bt = fork_call { 3728 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 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 |"
3261 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines