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.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.415 by root, Thu Apr 10 15:35:16 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
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422 538
423sub fork_call(&@) { 539sub fork_call(&@) {
424 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
425 541
426# 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,
427# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 545
431 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 547 reset_signals;
445 local $SIG{__WARN__}; 548 &$cb
446 local $SIG{__DIE__}; 549 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 550
453 eval { 551 wantarray ? @res : $res[-1]
454 close $fh1; 552}
455 553
456 my @res = eval { $cb->(@args) }; 554=item $coin = coin_from_name $name
457 555
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 556=cut
459 close $fh2;
460 };
461 557
462 warn $@ if $@; 558our %coin_alias = (
463 _exit 0; 559 "silver" => "silvercoin",
464 } 560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
465} 579}
466 580
467=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
468 582
469Returns a single value from the environment database. 583Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
472 586
473Stores the given C<$value> in the family. It can currently store binary 587Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 588data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475 589
590=item $db = cf::db_table "name"
591
592Create and/or open a new database table. The string must not be "db" and must be unique
593within each server.
594
476=cut 595=cut
596
597sub db_table($) {
598 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV;
600
601 eval {
602 $db->set_flags (BDB::CHKSUM);
603
604 utf8::encode $name;
605 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
606 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
607 cf::cleanup "db_open(db): $!" if $!;
608 };
609 cf::cleanup "db_open(db): $@" if $@;
610
611 $db
612}
477 613
478our $DB; 614our $DB;
479 615
480sub db_init { 616sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 617 cf::sync_job {
485 eval { 618 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 619 };
495} 620}
496 621
497sub db_get($$) { 622sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
499 624
549 if (1) { 674 if (1) {
550 $md5 = 675 $md5 =
551 join "\x00", 676 join "\x00",
552 $processversion, 677 $processversion,
553 map { 678 map {
554 Coro::cede; 679 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 680 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 681 } 0.. $#$src;
557 682
558 683
559 my $dbmd5 = db_get cache => "$id/md5"; 684 my $dbmd5 = db_get cache => "$id/md5";
603attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
605 730
606In the following description, CLASS can be any of C<global>, C<object> 731In the following description, CLASS can be any of C<global>, C<object>
607C<player>, C<client> or C<map> (i.e. the attachable objects in 732C<player>, C<client> or C<map> (i.e. the attachable objects in
608Crossfire TRT). 733Deliantra).
609 734
610=over 4 735=over 4
611 736
612=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
613 738
865 "; 990 ";
866 die if $@; 991 die if $@;
867} 992}
868 993
869our $override; 994our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 995our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 996
872sub override { 997sub override {
873 $override = 1; 998 $override = 1;
874 @invoke_results = (); 999 @INVOKE_RESULTS = (@_);
875} 1000}
876 1001
877sub do_invoke { 1002sub do_invoke {
878 my $event = shift; 1003 my $event = shift;
879 my $callbacks = shift; 1004 my $callbacks = shift;
880 1005
881 @invoke_results = (); 1006 @INVOKE_RESULTS = ();
882 1007
883 local $override; 1008 local $override;
884 1009
885 for (@$callbacks) { 1010 for (@$callbacks) {
886 eval { &{$_->[1]} }; 1011 eval { &{$_->[1]} };
895 } 1020 }
896 1021
897 0 1022 0
898} 1023}
899 1024
900=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
901 1026
902=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
903 1028
904Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
905 1030
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1031This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 1032removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 1033results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 1034
910=back 1035=back
911 1036
912=cut 1037=cut
913 1038
914############################################################################# 1039#############################################################################
915# object support 1040# object support
1041
1042sub _object_equal($$);
1043sub _object_equal($$) {
1044 my ($a, $b) = @_;
1045
1046 return 0 unless (ref $a) eq (ref $b);
1047
1048 if ("HASH" eq ref $a) {
1049 my @ka = keys %$a;
1050 my @kb = keys %$b;
1051
1052 return 0 if @ka != @kb;
1053
1054 for (0 .. $#ka) {
1055 return 0 unless $ka[$_] eq $kb[$_];
1056 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1057 }
1058
1059 } elsif ("ARRAY" eq ref $a) {
1060
1061 return 0 if @$a != @$b;
1062
1063 for (0 .. $#$a) {
1064 return 0 unless _object_equal $a->[$_], $b->[$_];
1065 }
1066
1067 } elsif ($a ne $b) {
1068 return 0;
1069 }
1070
1071 1
1072}
1073
1074our $SLOW_MERGES;#d#
1075sub _can_merge {
1076 my ($ob1, $ob2) = @_;
1077
1078 ++$SLOW_MERGES;#d#
1079
1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
1082}
916 1083
917sub reattach { 1084sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1086 my ($obj) = @_;
920 1087
941cf::attachable->attach ( 1108cf::attachable->attach (
942 prio => -1000000, 1109 prio => -1000000,
943 on_instantiate => sub { 1110 on_instantiate => sub {
944 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
945 1112
946 $data = from_json $data; 1113 $data = decode_json $data;
947 1114
948 for (@$data) { 1115 for (@$data) {
949 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
950 1117
951 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
967sub object_freezer_save { 1134sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
969 1136
970 sync_job { 1137 sync_job {
971 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
974 1142
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
979 close $fh; 1147 close $fh;
980 1148
981 if (@$objs) { 1149 if (@$objs) {
982 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
986 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
987 close $fh; 1155 close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
989 } 1157 }
997 } 1165 }
998 } else { 1166 } else {
999 aio_unlink $filename; 1167 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1001 } 1169 }
1002 } 1170 };
1003} 1171}
1004 1172
1005sub object_freezer_as_string { 1173sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1007 1175
1019 or return; 1187 or return;
1020 1188
1021 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1191 or return;
1192
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1025 } 1195 }
1026 1196
1197 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1029 return ($data, $av); 1201 ($data, $av)
1030} 1202}
1031 1203
1032=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1033 1205
1034=over 4 1206=over 4
1107 my ($pl, $buf) = @_; 1279 my ($pl, $buf) = @_;
1108 1280
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1281 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1282
1111 if (ref $msg) { 1283 if (ref $msg) {
1284 my ($type, $reply, @payload) =
1285 "ARRAY" eq ref $msg
1286 ? @$msg
1287 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1288
1289 my @reply;
1290
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1291 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1292 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1293 }
1294
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1117 } else { 1298 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1300 }
1120 1301
1121 cf::override; 1302 cf::override;
1174 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1175 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1176 1357
1177 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1178 warn $msg; 1359 warn $msg;
1179 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1180 exit 1;
1181 } 1361 }
1182 1362
1183 warn $msg; 1363 warn $msg;
1184 } 1364 }
1185 1365
1210use Coro::AIO; 1390use Coro::AIO;
1211 1391
1212=head3 cf::player 1392=head3 cf::player
1213 1393
1214=over 4 1394=over 4
1395
1396=item cf::player::num_playing
1397
1398Returns the official number of playing players, as per the Crossfire metaserver rules.
1399
1400=cut
1401
1402sub num_playing {
1403 scalar grep
1404 $_->ob->map
1405 && !$_->hidden
1406 && !$_->ob->flag (cf::FLAG_WIZ),
1407 cf::player::list
1408}
1215 1409
1216=item cf::player::find $login 1410=item cf::player::find $login
1217 1411
1218Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1219 1413
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1453
1260 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1261 or return; 1455 or return;
1456
1457 my $pl = cf::player::load_pl $f
1458 or return;
1459 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs;
1262 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1263 } 1462 }
1264 } 1463 }
1265} 1464}
1266 1465
1276 1475
1277 aio_mkdir playerdir $pl, 0770; 1476 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1477 $pl->{last_save} = $cf::RUNTIME;
1279 1478
1280 $pl->save_pl ($path); 1479 $pl->save_pl ($path);
1281 Coro::cede; 1480 cf::cede_to_tick;
1282} 1481}
1283 1482
1284sub new($) { 1483sub new($) {
1285 my ($login) = @_; 1484 my ($login) = @_;
1286 1485
1290 $self->{deny_save} = 1; 1489 $self->{deny_save} = 1;
1291 1490
1292 $cf::PLAYER{$login} = $self; 1491 $cf::PLAYER{$login} = $self;
1293 1492
1294 $self 1493 $self
1494}
1495
1496=item $player->send_msg ($channel, $msg, $color, [extra...])
1497
1498=cut
1499
1500sub send_msg {
1501 my $ns = shift->ns
1502 or return;
1503 $ns->send_msg (@_);
1295} 1504}
1296 1505
1297=item $pl->quit_character 1506=item $pl->quit_character
1298 1507
1299Nukes the player without looking back. If logged in, the connection will 1508Nukes the player without looking back. If logged in, the connection will
1354 or return []; 1563 or return [];
1355 1564
1356 my @logins; 1565 my @logins;
1357 1566
1358 for my $login (@$dirs) { 1567 for my $login (@$dirs) {
1568 my $path = path $login;
1569
1570 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1362 1576
1363 utf8::decode $login; 1577 utf8::decode $login;
1364 push @logins, $login; 1578 push @logins, $login;
1365 } 1579 }
1366 1580
1399 1613
1400Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1401 1615
1402=cut 1616=cut
1403 1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1404sub expand_cfpod { 1629sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1406 1631
1407 # escape & and < 1632 my $xml;
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410 1633
1411 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1412 1637
1413 1 while 1638 $group =~ s/&/&amp;/g;
1414 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1418 # replace G<male|female> tags 1643 ([BCGHITU])
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1644 <
1420 $self->gender ? $2 : $1 1645 (?:
1421 }ge 1646 ([^<>]*) (?{ $group = $^N })
1422 # replace H<hint text> 1647 | < $interior >
1423 || s{H<([^\>]*)>} 1648 )
1649 >
1650 %gcsx
1424 { 1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "") 1671 "")
1428 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1429 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1430 1683
1684 for ($xml) {
1431 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1433 1687
1434 # compress some whitespace 1688 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1439 1694
1440 $_ 1695 $xml
1441} 1696}
1697
1698no re 'eval';
1442 1699
1443sub hintmode { 1700sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode} 1702 $_[0]{hintmode}
1446} 1703}
1447 1704
1448=item $player->ext_reply ($msgid, %msg) 1705=item $player->ext_reply ($msgid, @msg)
1449 1706
1450Sends an ext reply to the player. 1707Sends an ext reply to the player.
1451 1708
1452=cut 1709=cut
1453 1710
1454sub ext_reply($$%) { 1711sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1712 my ($self, $id, @msg) = @_;
1456 1713
1457 $msg{msgid} = $id; 1714 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1715}
1460 1716
1461=item $player->ext_event ($type, %msg) 1717=item $player->ext_msg ($type, @msg)
1462 1718
1463Sends an ext event to the client. 1719Sends an ext event to the client.
1464 1720
1465=cut 1721=cut
1466 1722
1467sub ext_event($$%) { 1723sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1724 my ($self, $type, @msg) = @_;
1469 1725
1470 $self->ns->ext_event ($type, %msg); 1726 $self->ns->ext_msg ($type, @msg);
1471} 1727}
1472 1728
1473=head3 cf::region 1729=head3 cf::region
1474 1730
1475=over 4 1731=over 4
1488 my ($path) = @_; 1744 my ($path) = @_;
1489 1745
1490 my ($match, $specificity); 1746 my ($match, $specificity);
1491 1747
1492 for my $region (list) { 1748 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1749 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1750 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1751 if $region->specificity > $specificity;
1496 } 1752 }
1497 } 1753 }
1498 1754
1618 $self->init; # pass $1 etc. 1874 $self->init; # pass $1 etc.
1619 return $self; 1875 return $self;
1620 } 1876 }
1621 } 1877 }
1622 1878
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1879 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1880 ()
1625} 1881}
1626 1882
1627sub init { 1883sub init {
1628 my ($self) = @_; 1884 my ($self) = @_;
1691 1947
1692sub load_header_from($) { 1948sub load_header_from($) {
1693 my ($self, $path) = @_; 1949 my ($self, $path) = @_;
1694 1950
1695 utf8::encode $path; 1951 utf8::encode $path;
1696 #aio_open $path, O_RDONLY, 0 1952 my $f = new_from_file cf::object::thawer $path
1697 # or return;
1698
1699 $self->_load_header ($path)
1700 or return; 1953 or return;
1954
1955 $self->_load_header ($f)
1956 or return;
1957
1958 local $MAP_LOADING{$self->{path}} = $self;
1959 $f->resolve_delayed_derefs;
1701 1960
1702 $self->{load_path} = $path; 1961 $self->{load_path} = $path;
1703 1962
1704 1 1963 1
1705} 1964}
1759sub find { 2018sub find {
1760 my ($path, $origin) = @_; 2019 my ($path, $origin) = @_;
1761 2020
1762 $path = normalise $path, $origin && $origin->path; 2021 $path = normalise $path, $origin && $origin->path;
1763 2022
2023 cf::lock_wait "map_data:$path";#d#remove
1764 cf::lock_wait "map_find:$path"; 2024 cf::lock_wait "map_find:$path";
1765 2025
1766 $cf::MAP{$path} || do { 2026 $cf::MAP{$path} || do {
1767 my $guard = cf::lock_acquire "map_find:$path"; 2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
1768 my $map = new_from_path cf::map $path 2030 my $map = new_from_path cf::map $path
1769 or return; 2031 or return;
1770 2032
1771 $map->{last_save} = $cf::RUNTIME; 2033 $map->{last_save} = $cf::RUNTIME;
1772 2034
1774 or return; 2036 or return;
1775 2037
1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777 # doing this can freeze the server in a sync job, obviously 2039 # doing this can freeze the server in a sync job, obviously
1778 #$cf::WAIT_FOR_TICK->wait; 2040 #$cf::WAIT_FOR_TICK->wait;
2041 undef $guard1;
2042 undef $guard2;
1779 $map->reset; 2043 $map->reset;
1780 undef $guard;
1781 return find $path; 2044 return find $path;
1782 } 2045 }
1783 2046
1784 $cf::MAP{$path} = $map 2047 $cf::MAP{$path} = $map
1785 } 2048 }
1794 local $self->{deny_reset} = 1; # loading can take a long time 2057 local $self->{deny_reset} = 1; # loading can take a long time
1795 2058
1796 my $path = $self->{path}; 2059 my $path = $self->{path};
1797 2060
1798 { 2061 {
1799 my $guard = cf::lock_acquire "map_load:$path"; 2062 my $guard = cf::lock_acquire "map_data:$path";
1800 2063
2064 return unless $self->valid;
1801 return if $self->in_memory != cf::MAP_SWAPPED; 2065 return unless $self->in_memory == cf::MAP_SWAPPED;
1802 2066
1803 $self->in_memory (cf::MAP_LOADING); 2067 $self->in_memory (cf::MAP_LOADING);
1804 2068
1805 $self->alloc; 2069 $self->alloc;
1806 2070
1807 $self->pre_load; 2071 $self->pre_load;
1808 Coro::cede; 2072 cf::cede_to_tick;
1809 2073
2074 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block;
1810 $self->_load_objects ($self->{load_path}, 1) 2076 $self->_load_objects ($f)
1811 or return; 2077 or return;
1812 2078
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814 if delete $self->{load_original}; 2080 if delete $self->{load_original};
1815 2081
1816 if (my $uniq = $self->uniq_path) { 2082 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq; 2083 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) { 2084 unless (aio_stat $uniq) {
2085 if (my $f = new_from_file cf::object::thawer $uniq) {
1819 $self->clear_unique_items; 2086 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 2087 $self->_load_objects ($f);
2088 $f->resolve_delayed_derefs;
2089 }
1821 } 2090 }
1822 } 2091 }
1823 2092
1824 Coro::cede; 2093 $f->resolve_delayed_derefs;
2094
2095 cf::cede_to_tick;
1825 # now do the right thing for maps 2096 # now do the right thing for maps
1826 $self->link_multipart_objects; 2097 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 2098 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 2099 unless $self->difficulty;
1829 Coro::cede; 2100 cf::cede_to_tick;
1830 2101
1831 unless ($self->{deny_activate}) { 2102 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 2103 $self->decay_objects;
1833 $self->fix_auto_apply; 2104 $self->fix_auto_apply;
1834 $self->update_buttons; 2105 $self->update_buttons;
1835 Coro::cede; 2106 cf::cede_to_tick;
1836 $self->set_darkness_map; 2107 $self->set_darkness_map;
1837 Coro::cede; 2108 cf::cede_to_tick;
1838 $self->activate; 2109 $self->activate;
1839 } 2110 }
2111
2112 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME);
1840 2114
1841 $self->in_memory (cf::MAP_IN_MEMORY); 2115 $self->in_memory (cf::MAP_IN_MEMORY);
1842 } 2116 }
1843 2117
1844 $self->post_load; 2118 $self->post_load;
1855 2129
1856 $self 2130 $self
1857} 2131}
1858 2132
1859# find and load all maps in the 3x3 area around a map 2133# find and load all maps in the 3x3 area around a map
1860sub load_diag { 2134sub load_neighbours {
1861 my ($map) = @_; 2135 my ($map) = @_;
1862 2136
1863 my @diag; # diagonal neighbours 2137 my @neigh; # diagonal neighbours
1864 2138
1865 for (0 .. 3) { 2139 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 2140 my $neigh = $map->tile_path ($_)
1867 or next; 2141 or next;
1868 $neigh = find $neigh, $map 2142 $neigh = find $neigh, $map
1869 or next; 2143 or next;
1870 $neigh->load; 2144 $neigh->load;
1871 2145
2146 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2147 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2148 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 2149 }
1875 2150
1876 for (@diag) { 2151 for (grep defined $_->[0], @neigh) {
2152 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 2153 my $neigh = find $path, $origin
1878 or next; 2154 or next;
1879 $neigh->load; 2155 $neigh->load;
1880 } 2156 }
1881} 2157}
1882 2158
1887} 2163}
1888 2164
1889sub do_load_sync { 2165sub do_load_sync {
1890 my ($map) = @_; 2166 my ($map) = @_;
1891 2167
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main;
2170
1892 cf::sync_job { $map->load }; 2171 cf::sync_job { $map->load };
1893} 2172}
1894 2173
1895our %MAP_PREFETCH; 2174our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 2175our $MAP_PREFETCHER = undef;
1897 2176
1898sub find_async { 2177sub find_async {
1899 my ($path, $origin) = @_; 2178 my ($path, $origin, $load) = @_;
1900 2179
1901 $path = normalise $path, $origin && $origin->{path}; 2180 $path = normalise $path, $origin && $origin->{path};
1902 2181
1903 if (my $map = $cf::MAP{$path}) { 2182 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1905 } 2184 }
1906 2185
1907 undef $MAP_PREFETCH{$path}; 2186 $MAP_PREFETCH{$path} |= $load;
2187
1908 $MAP_PREFETCHER ||= cf::async { 2188 $MAP_PREFETCHER ||= cf::async {
2189 $Coro::current->{desc} = "map prefetcher";
2190
1909 while (%MAP_PREFETCH) { 2191 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 2192 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 2193 if (my $map = find $k) {
1912 or next;
1913 $map->load; 2194 $map->load if $v;
2195 }
1914 2196
1915 delete $MAP_PREFETCH{$path}; 2197 delete $MAP_PREFETCH{$k};
1916 } 2198 }
1917 } 2199 }
1918 undef $MAP_PREFETCHER; 2200 undef $MAP_PREFETCHER;
1919 }; 2201 };
1920 $MAP_PREFETCHER->prio (6); 2202 $MAP_PREFETCHER->prio (6);
1923} 2205}
1924 2206
1925sub save { 2207sub save {
1926 my ($self) = @_; 2208 my ($self) = @_;
1927 2209
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 2211
1930 $self->{last_save} = $cf::RUNTIME; 2212 $self->{last_save} = $cf::RUNTIME;
1931 2213
1932 return unless $self->dirty; 2214 return unless $self->dirty;
1933 2215
1939 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1940 2222
1941 local $self->{last_access} = $self->last_access;#d# 2223 local $self->{last_access} = $self->last_access;#d#
1942 2224
1943 cf::async { 2225 cf::async {
2226 $Coro::current->{desc} = "map player save";
1944 $_->contr->save for $self->players; 2227 $_->contr->save for $self->players;
1945 }; 2228 };
1946 2229
1947 if ($uniq) { 2230 if ($uniq) {
1948 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 my ($self) = @_; 2239 my ($self) = @_;
1957 2240
1958 # save first because save cedes 2241 # save first because save cedes
1959 $self->save; 2242 $self->save;
1960 2243
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2245
1963 return if $self->players; 2246 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
1965 return if $self->{deny_save}; 2248 return if $self->{deny_save};
1966 2249
2250 $self->in_memory (cf::MAP_SWAPPED);
2251
2252 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP;
1967 $self->clear; 2254 $self->clear;
1968 $self->in_memory (cf::MAP_SWAPPED);
1969} 2255}
1970 2256
1971sub reset_at { 2257sub reset_at {
1972 my ($self) = @_; 2258 my ($self) = @_;
1973 2259
2005 if $uniq; 2291 if $uniq;
2006 } 2292 }
2007 2293
2008 delete $cf::MAP{$self->path}; 2294 delete $cf::MAP{$self->path};
2009 2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2010 $self->clear; 2298 $self->clear;
2011
2012 $_->clear_links_to ($self) for values %cf::MAP;
2013 2299
2014 $self->unlink_save; 2300 $self->unlink_save;
2015 $self->destroy; 2301 $self->destroy;
2016} 2302}
2017 2303
2018my $nuke_counter = "aaaa"; 2304my $nuke_counter = "aaaa";
2019 2305
2020sub nuke { 2306sub nuke {
2021 my ($self) = @_; 2307 my ($self) = @_;
2022 2308
2309 {
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2023 delete $cf::MAP{$self->path}; 2312 delete $cf::MAP{$self->path};
2024 2313
2025 $self->unlink_save; 2314 $self->unlink_save;
2026 2315
2027 bless $self, "cf::map"; 2316 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2317 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2318 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2319 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2321
2033 $cf::MAP{$self->path} = $self; 2322 $cf::MAP{$self->path} = $self;
2323 }
2034 2324
2035 $self->reset; # polite request, might not happen 2325 $self->reset; # polite request, might not happen
2036} 2326}
2037 2327
2038=item $maps = cf::map::tmp_maps 2328=item $maps = cf::map::tmp_maps
2087 : () 2377 : ()
2088 } @{ aio_readdir $UNIQUEDIR or [] } 2378 } @{ aio_readdir $UNIQUEDIR or [] }
2089 ] 2379 ]
2090} 2380}
2091 2381
2092package cf;
2093
2094=back 2382=back
2095 2383
2096=head3 cf::object 2384=head3 cf::object
2097 2385
2098=cut 2386=cut
2112 map { $_, inv_recursive_ $_->inv } @_ 2400 map { $_, inv_recursive_ $_->inv } @_
2113} 2401}
2114 2402
2115sub inv_recursive { 2403sub inv_recursive {
2116 inv_recursive_ inv $_[0] 2404 inv_recursive_ inv $_[0]
2405}
2406
2407=item $ref = $ob->ref
2408
2409creates and returns a persistent reference to an objetc that can be stored as a string.
2410
2411=item $ob = cf::object::deref ($refstring)
2412
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block.
2415
2416=cut
2417
2418sub deref {
2419 my ($ref) = @_;
2420
2421 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2422 my ($uuid, $name) = ($1, $2);
2423 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2424 or return;
2425 $pl->ob->uuid eq $uuid
2426 or return;
2427
2428 $pl->ob
2429 } else {
2430 warn "$ref: cannot resolve object reference\n";
2431 undef
2432 }
2117} 2433}
2118 2434
2119package cf; 2435package cf;
2120 2436
2121=back 2437=back
2145 2461
2146 } else { 2462 } else {
2147 my $pl = $self->contr; 2463 my $pl = $self->contr;
2148 2464
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2465 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2466 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2468
2158 } else { 2469 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2470 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2471 $self->message ($msg, $flags);
2161 } 2472 }
2162 } 2473 }
2474}
2475
2476=item $object->send_msg ($channel, $msg, $color, [extra...])
2477
2478=cut
2479
2480sub cf::object::send_msg {
2481 my $pl = shift->contr
2482 or return;
2483 $pl->send_msg (@_);
2163} 2484}
2164 2485
2165=item $player_object->may ("access") 2486=item $player_object->may ("access")
2166 2487
2167Returns wether the given player is authorized to access resource "access" 2488Returns wether the given player is authorized to access resource "access"
2246 # use -1 or undef as default coordinates, not 0, 0 2567 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2568 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2569 if $x <=0 && $y <= 0;
2249 2570
2250 $map->load; 2571 $map->load;
2251 $map->load_diag; 2572 $map->load_neighbours;
2252 2573
2253 return unless $self->contr->active; 2574 return unless $self->contr->active;
2254 $self->activate_recursive; 2575 $self->activate_recursive;
2255 2576
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2578 $self->enter_map ($map, $x, $y);
2258} 2579}
2259 2580
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2582
2262Moves the player to the given map-path and coordinates by first freezing 2583Moves the player to the given map-path and coordinates by first freezing
2263her, loading and preparing them map, calling the provided $check callback 2584her, loading and preparing them map, calling the provided $check callback
2264that has to return the map if sucecssful, and then unfreezes the player on 2585that has to return the map if sucecssful, and then unfreezes the player on
2265the new (success) or old (failed) map position. 2586the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process.
2266 2588
2267=cut 2589=cut
2268 2590
2269our $GOTOGEN; 2591our $GOTOGEN;
2270 2592
2271sub cf::object::player::goto { 2593sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2594 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2595
2274 # do generation counting so two concurrent goto's will be executed in-order 2596 # do generation counting so two concurrent goto's will be executed in-order
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2598
2277 $self->enter_link; 2599 $self->enter_link;
2278 2600
2279 (async { 2601 (async {
2602 $Coro::current->{desc} = "player::goto $path $x $y";
2603
2604 # *tag paths override both path and x|y
2605 if ($path =~ /^\*(.*)$/) {
2606 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2607 my $ob = $obs[rand @obs];
2608
2609 # see if we actually can go there
2610 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2611 $ob = $obs[rand @obs];
2612 } else {
2613 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2614 }
2615 # else put us there anyways for now #d#
2616
2617 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2618 } else {
2619 ($path, $x, $y) = (undef, undef, undef);
2620 }
2621 }
2622
2280 my $map = eval { 2623 my $map = eval {
2281 my $map = cf::map::find $path; 2624 my $map = defined $path ? cf::map::find $path : undef;
2282 2625
2283 if ($map) { 2626 if ($map) {
2284 $map = $map->customise_for ($self); 2627 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map; 2628 $map = $check->($map) if $check && $map;
2286 } else { 2629 } else {
2287 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2630 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2288 } 2631 }
2289 2632
2290 $map 2633 $map
2291 }; 2634 };
2292 2635
2297 2640
2298 if ($gen == $self->{_goto_generation}) { 2641 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2642 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2643 $self->leave_link ($map, $x, $y);
2301 } 2644 }
2645
2646 $done->() if $done;
2302 })->prio (1); 2647 })->prio (1);
2303} 2648}
2304 2649
2305=item $player_object->enter_exit ($exit_object) 2650=item $player_object->enter_exit ($exit_object)
2306 2651
2343 $rmp->{origin_y} = $exit->y; 2688 $rmp->{origin_y} = $exit->y;
2344 } 2689 }
2345 2690
2346 $rmp->{random_seed} ||= $exit->random_seed; 2691 $rmp->{random_seed} ||= $exit->random_seed;
2347 2692
2348 my $data = cf::to_json $rmp; 2693 my $data = cf::encode_json $rmp;
2349 my $md5 = Digest::MD5::md5_hex $data; 2694 my $md5 = Digest::MD5::md5_hex $data;
2350 my $meta = "$RANDOMDIR/$md5.meta"; 2695 my $meta = "$RANDOMDIR/$md5.meta";
2351 2696
2352 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2353 aio_write $fh, 0, (length $data), $data, 0; 2698 aio_write $fh, 0, (length $data), $data, 0;
2380 # if exit is damned, update players death & WoR home-position 2725 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp) 2726 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED); 2727 if $exit->flag (FLAG_DAMNED);
2383 2728
2384 (async { 2729 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2731
2385 $self->deactivate_recursive; # just to be sure 2732 $self->deactivate_recursive; # just to be sure
2386 unless (eval { 2733 unless (eval {
2387 $self->goto ($slaying, $hp, $sp); 2734 $self->goto ($slaying, $hp, $sp);
2388 2735
2389 1; 2736 1;
2415 2762
2416 utf8::encode $text; 2763 utf8::encode $text;
2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2418} 2765}
2419 2766
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2767=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2768
2422Send a drawinfo or msg packet to the client, formatting the msg for the 2769Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of 2770client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress 2771the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet. 2772the message unless the client supports the msg packet.
2426 2773
2427=cut 2774=cut
2428 2775
2776# non-persistent channels (usually the info channel)
2777our %CHANNEL = (
2778 "c/identify" => {
2779 id => "infobox",
2780 title => "Identify",
2781 reply => undef,
2782 tooltip => "Items recently identified",
2783 },
2784 "c/examine" => {
2785 id => "infobox",
2786 title => "Examine",
2787 reply => undef,
2788 tooltip => "Signs and other items you examined",
2789 },
2790 "c/book" => {
2791 id => "infobox",
2792 title => "Book",
2793 reply => undef,
2794 tooltip => "The contents of a note or book",
2795 },
2796 "c/lookat" => {
2797 id => "infobox",
2798 title => "Look",
2799 reply => undef,
2800 tooltip => "What you saw there",
2801 },
2802 "c/who" => {
2803 id => "infobox",
2804 title => "Players",
2805 reply => undef,
2806 tooltip => "Shows players who are currently online",
2807 },
2808 "c/body" => {
2809 id => "infobox",
2810 title => "Body Parts",
2811 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available",
2813 },
2814 "c/uptime" => {
2815 id => "infobox",
2816 title => "Uptime",
2817 reply => undef,
2818 tooltip => "How long the server has been running since last restart",
2819 },
2820 "c/mapinfo" => {
2821 id => "infobox",
2822 title => "Map Info",
2823 reply => undef,
2824 tooltip => "Information related to the maps",
2825 },
2826);
2827
2429sub cf::client::send_msg { 2828sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2830
2432 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg);
2433 2832
2833 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834
2835 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel};
2838
2839 $self->ext_msg (channel_info => $channel)
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id};
2843
2844 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel)
2849 if $self->can_msg;
2850 }
2851
2852 $channel = $channel->{id};
2853 }
2854
2434 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2435 2856
2436 if ($self->can_msg) { 2857 if ($self->can_msg) {
2858 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF;
2861
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2862 $self->send_packet ("msg " . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2438 } else { 2864 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) { 2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875
2876 $color &= cf::NDI_COLOR_MASK;
2877
2878 utf8::encode $msg;
2879
2450 if (0 && $msg =~ /\[/) { 2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2883 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2885 $self->send_packet ("drawinfo $color $msg")
2455 } 2886 }
2456 } 2887 }
2457 } 2888 }
2458} 2889}
2459 2890
2460=item $client->ext_event ($type, %msg) 2891=item $client->ext_msg ($type, @msg)
2461 2892
2462Sends an ext event to the client. 2893Sends an ext event to the client.
2463 2894
2464=cut 2895=cut
2465 2896
2466sub cf::client::ext_event($$%) { 2897sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2898 my ($self, $type, @msg) = @_;
2468 2899
2900 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 2903 push @msg, msgtype => "event_$type";
2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 }
2906}
2907
2908=item $client->ext_reply ($msgid, @msg)
2909
2910Sends an ext reply to the client.
2911
2912=cut
2913
2914sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_;
2916
2917 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 }
2471} 2924}
2472 2925
2473=item $success = $client->query ($flags, "text", \&cb) 2926=item $success = $client->query ($flags, "text", \&cb)
2474 2927
2475Queues a query to the client, calling the given callback with 2928Queues a query to the client, calling the given callback with
2530 my ($ns, $buf) = @_; 2983 my ($ns, $buf) = @_;
2531 2984
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2985 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2986
2534 if (ref $msg) { 2987 if (ref $msg) {
2988 my ($type, $reply, @payload) =
2989 "ARRAY" eq ref $msg
2990 ? @$msg
2991 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2992
2993 my @reply;
2994
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2995 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2996 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 2997 }
2998
2999 $ns->ext_reply ($reply, @reply)
3000 if $reply;
3001
2541 } else { 3002 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 } 3004 }
2544 3005
2545 cf::override; 3006 cf::override;
2592our $safe = new Safe "safe"; 3053our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 3054our $safe_hole = new Safe::Hole;
2594 3055
2595$SIG{FPE} = 'IGNORE'; 3056$SIG{FPE} = 'IGNORE';
2596 3057
2597$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3058$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math
3060 grepstart grepwhile mapstart mapwhile
3061 sort time
3062));
2598 3063
2599# here we export the classes and methods available to script code 3064# here we export the classes and methods available to script code
2600 3065
2601=pod 3066=pod
2602 3067
2603The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2604 3069
2605 cf::object 3070 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 3071 contr pay_amount pay_player map x y force_find force_add destroy
2607 insert remove 3072 insert remove name archname title slaying race decrease_ob_nr
2608 3073
2609 cf::object::player 3074 cf::object::player
2610 player 3075 player
2611 3076
2612 cf::player 3077 cf::player
2617 3082
2618=cut 3083=cut
2619 3084
2620for ( 3085for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race
2622 insert remove)], 3088 decrease_ob_nr destroy)],
2623 ["cf::object::player" => qw(player)], 3089 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 3090 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 3091 ["cf::map" => qw(trigger)],
2626) { 3092) {
2627 no strict 'refs'; 3093 no strict 'refs';
2703# the server's init and main functions 3169# the server's init and main functions
2704 3170
2705sub load_facedata($) { 3171sub load_facedata($) {
2706 my ($path) = @_; 3172 my ($path) = @_;
2707 3173
3174 # HACK to clear player env face cache, we need some signal framework
3175 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = ();
3177
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179
2708 warn "loading facedata from $path\n"; 3180 warn "loading facedata from $path\n";
2709 3181
2710 my $facedata; 3182 my $facedata;
2711 0 < aio_load $path, $facedata 3183 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 3184 or die "$path: $!";
2714 $facedata = Coro::Storable::thaw $facedata; 3186 $facedata = Coro::Storable::thaw $facedata;
2715 3187
2716 $facedata->{version} == 2 3188 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 3189 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 3190
3191 # patch in the exptable
3192 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC,
3194 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3195 };
3196 cf::cede_to_tick;
3197
2719 { 3198 {
2720 my $faces = $facedata->{faceinfo}; 3199 my $faces = $facedata->{faceinfo};
2721 3200
2722 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3202 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3204 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 3208
3209 cf::cede_to_tick;
2728 } 3210 }
2729 3211
2730 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 3213 next unless $info->{smooth};
3214
2732 my $idx = cf::face::find $face 3215 my $idx = cf::face::find $face
2733 or next; 3216 or next;
3217
2734 if (my $smooth = cf::face::find $info->{smooth}) { 3218 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 3221 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3222 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 3223 }
2739 Coro::cede; 3224
3225 cf::cede_to_tick;
2740 } 3226 }
2741 } 3227 }
2742 3228
2743 { 3229 {
2744 my $anims = $facedata->{animinfo}; 3230 my $anims = $facedata->{animinfo};
2745 3231
2746 while (my ($anim, $info) = each %$anims) { 3232 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3233 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 3234 cf::cede_to_tick;
2749 } 3235 }
2750 3236
2751 cf::anim::invalidate_all; # d'oh 3237 cf::anim::invalidate_all; # d'oh
2752 } 3238 }
2753 3239
3240 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource};
3244
3245 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249
3250 if ($info->{type} & 1) {
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type};
3265 } else {
3266 $RESOURCE{$name} = $info;
3267 }
3268
3269 cf::cede_to_tick;
3270 }
3271 }
3272
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274
2754 1 3275 1
2755} 3276}
2756 3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297
3298register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_;
3300
3301 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v);
3303 }
3304};
3305
2757sub reload_regions { 3306sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = ();
3310
2758 load_resource_file "$MAPDIR/regions" 3311 load_resource_file "$MAPDIR/regions"
2759 or die "unable to load regions file\n"; 3312 or die "unable to load regions file\n";
3313
3314 for (cf::region::list) {
3315 $_->{match} = qr/$_->{match}/
3316 if exists $_->{match};
3317 }
2760} 3318}
2761 3319
2762sub reload_facedata { 3320sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3321 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3322 or die "unable to load facedata\n";
2793 3351
2794sub init { 3352sub init {
2795 reload_resources; 3353 reload_resources;
2796} 3354}
2797 3355
2798sub cfg_load { 3356sub reload_config {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3357 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3358 or return;
2801 3359
2802 local $/; 3360 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3361 *CFG = YAML::Load <$fh>;
2804 3362
2805 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2806 3364
2807 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2808 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2819sub main { 3377sub main {
2820 # we must not ever block the main coroutine 3378 # we must not ever block the main coroutine
2821 local $Coro::idle = sub { 3379 local $Coro::idle = sub {
2822 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2823 (async { 3381 (async {
2824 Event::one_event; 3382 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT;
2825 })->prio (Coro::PRIO_MAX); 3384 })->prio (Coro::PRIO_MAX);
2826 }; 3385 };
2827 3386
2828 cfg_load; 3387 reload_config;
2829 db_init; 3388 db_init;
2830 load_extensions; 3389 load_extensions;
2831 3390
2832 $TICK_WATCHER->start; 3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno;
2833 Event::loop; 3393 EV::loop;
2834} 3394}
2835 3395
2836############################################################################# 3396#############################################################################
2837# initialisation and cleanup 3397# initialisation and cleanup
2838 3398
2839# install some emergency cleanup handlers 3399# install some emergency cleanup handlers
2840BEGIN { 3400BEGIN {
3401 our %SIGWATCHER = ();
2841 for my $signal (qw(INT HUP TERM)) { 3402 for my $signal (qw(INT HUP TERM)) {
2842 Event->signal ( 3403 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2843 reentrant => 0,
2844 data => WF_AUTOCANCEL,
2845 signal => $signal,
2846 prio => 0,
2847 cb => sub {
2848 cf::cleanup "SIG$signal"; 3404 cf::cleanup "SIG$signal";
2849 },
2850 ); 3405 };
2851 } 3406 }
2852} 3407}
2853 3408
2854sub write_runtime { 3409sub write_runtime {
2855 my $runtime = "$LOCALDIR/runtime"; 3410 my $runtime = "$LOCALDIR/runtime";
2900 # and maps saved/destroyed asynchronously. 3455 # and maps saved/destroyed asynchronously.
2901 warn "begin emergency player save\n"; 3456 warn "begin emergency player save\n";
2902 for my $login (keys %cf::PLAYER) { 3457 for my $login (keys %cf::PLAYER) {
2903 my $pl = $cf::PLAYER{$login} or next; 3458 my $pl = $cf::PLAYER{$login} or next;
2904 $pl->valid or next; 3459 $pl->valid or next;
3460 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2905 $pl->save; 3461 $pl->save;
2906 } 3462 }
2907 warn "end emergency player save\n"; 3463 warn "end emergency player save\n";
2908 3464
2909 warn "begin emergency map save\n"; 3465 warn "begin emergency map save\n";
2948 warn "syncing database to disk"; 3504 warn "syncing database to disk";
2949 BDB::db_env_txn_checkpoint $DB_ENV; 3505 BDB::db_env_txn_checkpoint $DB_ENV;
2950 3506
2951 # if anything goes wrong in here, we should simply crash as we already saved 3507 # if anything goes wrong in here, we should simply crash as we already saved
2952 3508
2953 warn "cancelling all WF_AUTOCANCEL watchers";
2954 for (Event::all_watchers) {
2955 $_->cancel if $_->data & WF_AUTOCANCEL;
2956 }
2957
2958 warn "flushing outstanding aio requests"; 3509 warn "flushing outstanding aio requests";
2959 for (;;) { 3510 for (;;) {
2960 BDB::flush; 3511 BDB::flush;
2961 IO::AIO::flush; 3512 IO::AIO::flush;
2962 Coro::cede; 3513 Coro::cede_notself;
2963 last unless IO::AIO::nreqs || BDB::nreqs; 3514 last unless IO::AIO::nreqs || BDB::nreqs;
2964 warn "iterate..."; 3515 warn "iterate...";
2965 } 3516 }
2966 3517
2967 ++$RELOAD; 3518 ++$RELOAD;
3026 warn "reloading cf.pm"; 3577 warn "reloading cf.pm";
3027 require cf; 3578 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3579 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029 3580
3030 warn "loading config and database again"; 3581 warn "loading config and database again";
3031 cf::cfg_load; 3582 cf::reload_config;
3032 3583
3033 warn "loading extensions"; 3584 warn "loading extensions";
3034 cf::load_extensions; 3585 cf::load_extensions;
3035 3586
3036 warn "reattaching attachments to objects/players"; 3587 warn "reattaching attachments to objects/players";
3043 warn "leaving sync_job"; 3594 warn "leaving sync_job";
3044 3595
3045 1 3596 1
3046 } or do { 3597 } or do {
3047 warn $@; 3598 warn $@;
3048 warn "error while reloading, exiting."; 3599 cf::cleanup "error while reloading, exiting.";
3049 exit 1;
3050 }; 3600 };
3051 3601
3052 warn "reloaded"; 3602 warn "reloaded";
3053}; 3603};
3054 3604
3056 3606
3057sub reload_perl() { 3607sub reload_perl() {
3058 # doing reload synchronously and two reloads happen back-to-back, 3608 # doing reload synchronously and two reloads happen back-to-back,
3059 # coro crashes during coro_state_free->destroy here. 3609 # coro crashes during coro_state_free->destroy here.
3060 3610
3061 $RELOAD_WATCHER ||= Event->timer ( 3611 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3062 reentrant => 0,
3063 after => 0,
3064 data => WF_AUTOCANCEL,
3065 cb => sub {
3066 do_reload_perl; 3612 do_reload_perl;
3067 undef $RELOAD_WATCHER; 3613 undef $RELOAD_WATCHER;
3068 },
3069 ); 3614 };
3070} 3615}
3071 3616
3072register_command "reload" => sub { 3617register_command "reload" => sub {
3073 my ($who, $arg) = @_; 3618 my ($who, $arg) = @_;
3074 3619
3075 if ($who->flag (FLAG_WIZ)) { 3620 if ($who->flag (FLAG_WIZ)) {
3076 $who->message ("reloading server."); 3621 $who->message ("reloading server.");
3622 async {
3623 $Coro::current->{desc} = "perl_reload";
3077 async { reload_perl }; 3624 reload_perl;
3625 };
3078 } 3626 }
3079}; 3627};
3080 3628
3081unshift @INC, $LIBDIR; 3629unshift @INC, $LIBDIR;
3082 3630
3084 3632
3085our @WAIT_FOR_TICK; 3633our @WAIT_FOR_TICK;
3086our @WAIT_FOR_TICK_BEGIN; 3634our @WAIT_FOR_TICK_BEGIN;
3087 3635
3088sub wait_for_tick { 3636sub wait_for_tick {
3089 return unless $TICK_WATCHER->is_active; 3637 return if tick_inhibit;
3090 return if $Coro::current == $Coro::main; 3638 return if $Coro::current == $Coro::main;
3091 3639
3092 my $signal = new Coro::Signal; 3640 my $signal = new Coro::Signal;
3093 push @WAIT_FOR_TICK, $signal; 3641 push @WAIT_FOR_TICK, $signal;
3094 $signal->wait; 3642 $signal->wait;
3095} 3643}
3096 3644
3097sub wait_for_tick_begin { 3645sub wait_for_tick_begin {
3098 return unless $TICK_WATCHER->is_active; 3646 return if tick_inhibit;
3099 return if $Coro::current == $Coro::main; 3647 return if $Coro::current == $Coro::main;
3100 3648
3101 my $signal = new Coro::Signal; 3649 my $signal = new Coro::Signal;
3102 push @WAIT_FOR_TICK_BEGIN, $signal; 3650 push @WAIT_FOR_TICK_BEGIN, $signal;
3103 $signal->wait; 3651 $signal->wait;
3104} 3652}
3105 3653
3106 my $min = 1e6;#d# 3654sub tick {
3107 my $avg = 10;
3108$TICK_WATCHER = Event->timer (
3109 reentrant => 0,
3110 parked => 1,
3111 prio => 0,
3112 at => $NEXT_TICK || $TICK,
3113 data => WF_AUTOCANCEL,
3114 cb => sub {
3115 if ($Coro::current != $Coro::main) { 3655 if ($Coro::current != $Coro::main) {
3116 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3656 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3117 unless ++$bug_warning > 10; 3657 unless ++$bug_warning > 10;
3118 return; 3658 return;
3119 } 3659 }
3120 3660
3121 $NOW = $tick_start = Event::time;
3122
3123 cf::server_tick; # one server iteration 3661 cf::server_tick; # one server iteration
3124 3662
3125 0 && sync_job {#d# 3663 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3126 for(1..10) { 3664 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3127 my $t = Event::time; 3665 Coro::async_pool {
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3666 $Coro::current->{desc} = "runtime saver";
3129 or die; 3667 write_runtime
3130 3668 or warn "ERROR: unable to write runtime file: $!";
3131 $map->width (50);
3132 $map->height (50);
3133 $map->alloc;
3134 $map->_load_objects ("/tmp/x.map", 1);
3135 my $t = Event::time - $t;
3136
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 }; 3669 };
3670 }
3147 3671
3148 $RUNTIME += $TICK;
3149 $NEXT_TICK += $TICK;
3150
3151 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152 $NEXT_RUNTIME_WRITE = $NOW + 10;
3153 Coro::async_pool {
3154 write_runtime
3155 or warn "ERROR: unable to write runtime file: $!";
3156 };
3157 }
3158
3159# my $AFTER = Event::time;
3160# warn $AFTER - $NOW;#d#
3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3672 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send; 3673 $sig->send;
3164 } 3674 }
3165 while (my $sig = shift @WAIT_FOR_TICK) { 3675 while (my $sig = shift @WAIT_FOR_TICK) {
3166 $sig->send; 3676 $sig->send;
3167 } 3677 }
3168 3678
3169 $NOW = Event::time; 3679 $LOAD = ($NOW - $TICK_START) / $TICK;
3170
3171 # if we are delayed by four ticks or more, skip them all
3172 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3173
3174 $TICK_WATCHER->at ($NEXT_TICK);
3175 $TICK_WATCHER->start;
3176
3177 $LOAD = ($NOW - $tick_start) / $TICK;
3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3680 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179 3681
3180 _post_tick; 3682 if (0) {
3181 3683 if ($NEXT_TICK) {
3182 3684 my $jitter = $TICK_START - $NEXT_TICK;
3685 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3686 warn "jitter $JITTER\n";#d#
3687 }
3183 }, 3688 }
3184); 3689}
3185 3690
3186{ 3691{
3187 BDB::max_poll_time $TICK * 0.1; 3692 # configure BDB
3188 $BDB_POLL_WATCHER = Event->io ( 3693
3189 reentrant => 0,
3190 fd => BDB::poll_fileno,
3191 poll => 'r',
3192 prio => 0,
3193 data => WF_AUTOCANCEL,
3194 cb => \&BDB::poll_cb,
3195 );
3196 BDB::min_parallel 8; 3694 BDB::min_parallel 8;
3197 3695 BDB::max_poll_reqs $TICK * 0.1;
3198 BDB::set_sync_prepare { 3696 $Coro::BDB::WATCHER->priority (1);
3199 my $status;
3200 my $current = $Coro::current;
3201 (
3202 sub {
3203 $status = $!;
3204 $current->ready; undef $current;
3205 },
3206 sub {
3207 Coro::schedule while defined $current;
3208 $! = $status;
3209 },
3210 )
3211 };
3212 3697
3213 unless ($DB_ENV) { 3698 unless ($DB_ENV) {
3214 $DB_ENV = BDB::db_env_create; 3699 $DB_ENV = BDB::db_env_create;
3700 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3701 | BDB::LOG_AUTOREMOVE, 1);
3702 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3703 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3215 3704
3216 cf::sync_job { 3705 cf::sync_job {
3217 eval { 3706 eval {
3218 BDB::db_env_open 3707 BDB::db_env_open
3219 $DB_ENV, 3708 $DB_ENV,
3221 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3710 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3711 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223 0666; 3712 0666;
3224 3713
3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3714 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228 $DB_ENV->set_lk_detect;
3229 }; 3715 };
3230 3716
3231 cf::cleanup "db_env_open(db): $@" if $@; 3717 cf::cleanup "db_env_open(db): $@" if $@;
3232 }; 3718 };
3233 } 3719 }
3720
3721 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3722 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3723 };
3724 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3725 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3726 };
3727 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3728 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3729 };
3234} 3730}
3235 3731
3236{ 3732{
3733 # configure IO::AIO
3734
3237 IO::AIO::min_parallel 8; 3735 IO::AIO::min_parallel 8;
3238
3239 undef $Coro::AIO::WATCHER;
3240 IO::AIO::max_poll_time $TICK * 0.1; 3736 IO::AIO::max_poll_time $TICK * 0.1;
3241 $AIO_POLL_WATCHER = Event->io ( 3737 $Coro::AIO::WATCHER->priority (1);
3242 reentrant => 0,
3243 data => WF_AUTOCANCEL,
3244 fd => IO::AIO::poll_fileno,
3245 poll => 'r',
3246 prio => 6,
3247 cb => \&IO::AIO::poll_cb,
3248 );
3249} 3738}
3250 3739
3251my $_log_backtrace; 3740my $_log_backtrace;
3252 3741
3253sub _log_backtrace { 3742sub _log_backtrace {
3257 3746
3258 # limit the # of concurrent backtraces 3747 # limit the # of concurrent backtraces
3259 if ($_log_backtrace < 2) { 3748 if ($_log_backtrace < 2) {
3260 ++$_log_backtrace; 3749 ++$_log_backtrace;
3261 async { 3750 async {
3751 $Coro::current->{desc} = "abt $msg";
3752
3262 my @bt = fork_call { 3753 my @bt = fork_call {
3263 @addr = map { sprintf "%x", $_ } @addr; 3754 @addr = map { sprintf "%x", $_ } @addr;
3264 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3755 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3756 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3266 or die "addr2line: $!"; 3757 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines