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.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.416 by root, Fri Apr 11 13:59:06 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
48use JSON::XS 2.01 ();
25use BDB (); 49use BDB ();
26use Data::Dumper; 50use Data::Dumper;
27use Digest::MD5; 51use Digest::MD5;
28use Fcntl; 52use Fcntl;
29use YAML::Syck (); 53use YAML ();
30use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
31use Time::HiRes; 55use Time::HiRes;
32use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
33 58
34# configure various modules to our taste 59# configure various modules to our taste
35# 60#
36$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 64
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 66
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 68
49our %COMMAND = (); 69our %COMMAND = ();
50our %COMMAND_TIME = (); 70our %COMMAND_TIME = ();
51 71
52our @EXTS = (); # list of extension package names 72our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 73our %EXTCMD = ();
74our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 75our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 76our %EXT_MAP = (); # pluggable maps
56 77
57our $RELOAD; # number of reloads so far 78our $RELOAD; # number of reloads so far
58our @EVENT; 79our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
71 93
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 97our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
79 99
80our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 104our $DB_ENV;
82 105
83our %CFG; 106our %CFG;
84 107
85our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 109our $RUNTIME;
110our $NOW;
87 111
88our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
91 115
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 118
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
98 123
99binmode STDOUT; 124binmode STDOUT;
100binmode STDERR; 125binmode STDERR;
101 126
102# read virtual server time, if available 127# read virtual server time, if available
155 180
156The raw value load value from the last tick. 181The raw value load value from the last tick.
157 182
158=item %cf::CFG 183=item %cf::CFG
159 184
160Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 186from wherever your confdir points to.
162 187
163=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
164 189
165These 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
166returns 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
167per 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.
168 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
169=back 200=back
170 201
171=cut 202=cut
172 203
173BEGIN { 204BEGIN {
177 $msg .= "\n" 208 $msg .= "\n"
178 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
179 210
180 $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;
181 212
182 utf8::encode $msg;
183 LOG llevError, $msg; 213 LOG llevError, $msg;
184 }; 214 };
185} 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#?
186 231
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
203)) { 248)) {
204 no strict 'refs'; 249 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 251}
207 252
208$Event::DIED = sub { 253$EV::DIED = sub {
209 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
210}; 255};
211 256
212############################################################################# 257#############################################################################
213 258
236 $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;
237 $d 282 $d
238 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
239} 284}
240 285
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
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.
293
294=cut
295
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297
298sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) }
250 300
251=item cf::lock_wait $string 301=item cf::lock_wait $string
252 302
253Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
254 304
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
260returned. 310returned.
261 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
262Lock 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
263uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
264 317
265=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
266 319
267Return 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.
268 321
269=cut 322=cut
270 323
271our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
272 326
273sub lock_wait($) { 327sub lock_wait($) {
274 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#
275 334
276 # wait for lock, if any 335 # wait for lock, if any
277 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 338 Coro::schedule;
285 344
286 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
287 lock_wait $key; 346 lock_wait $key;
288 347
289 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
290 350
291 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
294 } 355 }
295} 356}
296 357
299 360
300 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
301} 362}
302 363
303sub freeze_mainloop { 364sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
305 366
306 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
307 $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 }
308 }; 428 }
309 $TICK_WATCHER->stop; 429};
310 $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;
311} 441}
312 442
313=item cf::async { BLOCK } 443=item cf::async { BLOCK }
314 444
315Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
320 450
321BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
322 452
323=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
324 454
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
327partly 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
328acceptable. 458acceptable.
329 459
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
336 466
337sub sync_job(&) { 467sub sync_job(&) {
338 my ($job) = @_; 468 my ($job) = @_;
339 469
340 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 471 my $time = EV::time;
342 472
343 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
345 475
346 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 477
348 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
349 479
350 my $busy = 1; 480 my $busy = 1;
351 my @res; 481 my @res;
352 482
353 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 485 @res = eval { $job->() };
355 warn $@ if $@; 486 warn $@ if $@;
356 undef $busy; 487 undef $busy;
357 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
358 489
359 while ($busy) { 490 while ($busy) {
360 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
361 } 495 }
496 }
362 497
363 $time = Event::time - $time; 498 my $time = EV::time - $time;
364 499
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
369 501
370 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
371 } else { 503 } else {
372 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
373 505
398=item fork_call { }, $args 530=item fork_call { }, $args
399 531
400Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
404 536
405=cut 537=cut
406 538
407sub fork_call(&@) { 539sub fork_call(&@) {
408 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
409 541
410# 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,
411# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 545
415 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 547 reset_signals;
428 local $SIG{__WARN__}; 548 &$cb
429 local $SIG{__DIE__}; 549 }, @args;
430 eval {
431 close $fh1;
432 550
433 my @res = eval { $cb->(@args) }; 551 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 552}
435 };
436 553
437 warn $@ if $@; 554=item $coin = coin_from_name $name
438 _exit 0; 555
439 } 556=cut
557
558our %coin_alias = (
559 "silver" => "silvercoin",
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
440} 579}
441 580
442=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
443 582
444Returns a single value from the environment database. 583Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
447 586
448Stores 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
449data 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).
450 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
451=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}
452 613
453our $DB; 614our $DB;
454 615
455sub db_init { 616sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 617 cf::sync_job {
460 eval { 618 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 619 };
470} 620}
471 621
472sub db_get($$) { 622sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
474 624
524 if (1) { 674 if (1) {
525 $md5 = 675 $md5 =
526 join "\x00", 676 join "\x00",
527 $processversion, 677 $processversion,
528 map { 678 map {
529 Coro::cede; 679 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 680 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 681 } 0.. $#$src;
532 682
533 683
534 my $dbmd5 = db_get cache => "$id/md5"; 684 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
580 730
581In 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>
582C<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
583Crossfire TRT). 733Deliantra).
584 734
585=over 4 735=over 4
586 736
587=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
588 738
840 "; 990 ";
841 die if $@; 991 die if $@;
842} 992}
843 993
844our $override; 994our $override;
845our @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?
846 996
847sub override { 997sub override {
848 $override = 1; 998 $override = 1;
849 @invoke_results = (); 999 @INVOKE_RESULTS = (@_);
850} 1000}
851 1001
852sub do_invoke { 1002sub do_invoke {
853 my $event = shift; 1003 my $event = shift;
854 my $callbacks = shift; 1004 my $callbacks = shift;
855 1005
856 @invoke_results = (); 1006 @INVOKE_RESULTS = ();
857 1007
858 local $override; 1008 local $override;
859 1009
860 for (@$callbacks) { 1010 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1011 eval { &{$_->[1]} };
870 } 1020 }
871 1021
872 0 1022 0
873} 1023}
874 1024
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1026
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1028
879Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
880 1030
881This 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
882removed 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
883results (if you must, access C<@cf::invoke_results> directly). 1033results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1034
885=back 1035=back
886 1036
887=cut 1037=cut
888 1038
889############################################################################# 1039#############################################################################
890# 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}
891 1083
892sub reattach { 1084sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1086 my ($obj) = @_;
895 1087
916cf::attachable->attach ( 1108cf::attachable->attach (
917 prio => -1000000, 1109 prio => -1000000,
918 on_instantiate => sub { 1110 on_instantiate => sub {
919 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
920 1112
921 $data = from_json $data; 1113 $data = decode_json $data;
922 1114
923 for (@$data) { 1115 for (@$data) {
924 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
925 1117
926 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1134sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
944 1136
945 sync_job { 1137 sync_job {
946 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
949 1142
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1147 close $fh;
955 1148
956 if (@$objs) { 1149 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1155 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
964 } 1157 }
972 } 1165 }
973 } else { 1166 } else {
974 aio_unlink $filename; 1167 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
976 } 1169 }
977 } 1170 };
978} 1171}
979 1172
980sub object_freezer_as_string { 1173sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
982 1175
994 or return; 1187 or return;
995 1188
996 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
998 or return; 1191 or return;
1192
999 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1000 } 1195 }
1001 1196
1197 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1004 return ($data, $av); 1201 ($data, $av)
1005} 1202}
1006 1203
1007=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1008 1205
1009=over 4 1206=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1226 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1227}
1031 1228
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1229=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1230
1034Register a callback fro execution when the client sends an extcmd packet. 1231Register a callback for execution when the client sends an (synchronous)
1232extcmd packet. Ext commands will be processed in the order they are
1233received by the server, like other user commands. The first argument is
1234the logged-in player. Ext commands can only be processed after a player
1235has logged in successfully.
1035 1236
1036If the callback returns something, it is sent back as if reply was being 1237If the callback returns something, it is sent back as if reply was being
1037called. 1238called.
1038 1239
1240=item cf::register_exticmd $name => \&callback($ns,$packet);
1241
1242Register a callback for execution when the client sends an (asynchronous)
1243exticmd packet. Exti commands are processed by the server as soon as they
1244are received, i.e. out of order w.r.t. other commands. The first argument
1245is a client socket. Exti commands can be received anytime, even before
1246log-in.
1247
1248If the callback returns something, it is sent back as if reply was being
1249called.
1250
1039=cut 1251=cut
1040 1252
1041sub register_extcmd { 1253sub register_extcmd {
1042 my ($name, $cb) = @_; 1254 my ($name, $cb) = @_;
1043 1255
1044 $EXTCMD{$name} = $cb; 1256 $EXTCMD{$name} = $cb;
1257}
1258
1259sub register_exticmd {
1260 my ($name, $cb) = @_;
1261
1262 $EXTICMD{$name} = $cb;
1045} 1263}
1046 1264
1047cf::player->attach ( 1265cf::player->attach (
1048 on_command => sub { 1266 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1267 my ($pl, $name, $params) = @_;
1058 cf::override; 1276 cf::override;
1059 }, 1277 },
1060 on_extcmd => sub { 1278 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1279 my ($pl, $buf) = @_;
1062 1280
1063 my $msg = eval { from_json $buf }; 1281 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1282
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1291 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1292 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1293 }
1294
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1071 } else { 1298 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1300 }
1074 1301
1075 cf::override; 1302 cf::override;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1130 1357
1131 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1359 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1361 }
1136 1362
1137 warn $msg; 1363 warn $msg;
1138 } 1364 }
1139 1365
1164use Coro::AIO; 1390use Coro::AIO;
1165 1391
1166=head3 cf::player 1392=head3 cf::player
1167 1393
1168=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}
1169 1409
1170=item cf::player::find $login 1410=item cf::player::find $login
1171 1411
1172Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1173 1413
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1453
1214 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1217 } 1462 }
1218 } 1463 }
1219} 1464}
1220 1465
1230 1475
1231 aio_mkdir playerdir $pl, 0770; 1476 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1477 $pl->{last_save} = $cf::RUNTIME;
1233 1478
1234 $pl->save_pl ($path); 1479 $pl->save_pl ($path);
1235 Coro::cede; 1480 cf::cede_to_tick;
1236} 1481}
1237 1482
1238sub new($) { 1483sub new($) {
1239 my ($login) = @_; 1484 my ($login) = @_;
1240 1485
1244 $self->{deny_save} = 1; 1489 $self->{deny_save} = 1;
1245 1490
1246 $cf::PLAYER{$login} = $self; 1491 $cf::PLAYER{$login} = $self;
1247 1492
1248 $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 (@_);
1249} 1504}
1250 1505
1251=item $pl->quit_character 1506=item $pl->quit_character
1252 1507
1253Nukes the player without looking back. If logged in, the connection will 1508Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1563 or return [];
1309 1564
1310 my @logins; 1565 my @logins;
1311 1566
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1316 1576
1317 utf8::decode $login; 1577 utf8::decode $login;
1318 push @logins, $login; 1578 push @logins, $login;
1319 } 1579 }
1320 1580
1347 } 1607 }
1348 1608
1349 \@paths 1609 \@paths
1350} 1610}
1351 1611
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1613
1614Expand crossfire pod fragments into protocol xml.
1615
1616=cut
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
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
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") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704
1352=item $player->ext_reply ($msgid, %msg) 1705=item $player->ext_reply ($msgid, @msg)
1353 1706
1354Sends an ext reply to the player. 1707Sends an ext reply to the player.
1355 1708
1356=cut 1709=cut
1357 1710
1358sub ext_reply($$%) { 1711sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1712 my ($self, $id, @msg) = @_;
1360 1713
1361 $msg{msgid} = $id; 1714 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1715}
1365 1716
1366=item $player->ext_event ($type, %msg) 1717=item $player->ext_msg ($type, @msg)
1367 1718
1368Sends an ext event to the client. 1719Sends an ext event to the client.
1369 1720
1370=cut 1721=cut
1371 1722
1372sub ext_event($$%) { 1723sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1724 my ($self, $type, @msg) = @_;
1374 1725
1375 $self->ns->ext_event ($type, %msg); 1726 $self->ns->ext_msg ($type, @msg);
1376} 1727}
1377 1728
1378=head3 cf::region 1729=head3 cf::region
1379 1730
1380=over 4 1731=over 4
1393 my ($path) = @_; 1744 my ($path) = @_;
1394 1745
1395 my ($match, $specificity); 1746 my ($match, $specificity);
1396 1747
1397 for my $region (list) { 1748 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1749 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1750 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1751 if $region->specificity > $specificity;
1401 } 1752 }
1402 } 1753 }
1403 1754
1523 $self->init; # pass $1 etc. 1874 $self->init; # pass $1 etc.
1524 return $self; 1875 return $self;
1525 } 1876 }
1526 } 1877 }
1527 1878
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1879 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1880 ()
1530} 1881}
1531 1882
1532sub init { 1883sub init {
1533 my ($self) = @_; 1884 my ($self) = @_;
1596 1947
1597sub load_header_from($) { 1948sub load_header_from($) {
1598 my ($self, $path) = @_; 1949 my ($self, $path) = @_;
1599 1950
1600 utf8::encode $path; 1951 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1952 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 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;
1606 1960
1607 $self->{load_path} = $path; 1961 $self->{load_path} = $path;
1608 1962
1609 1 1963 1
1610} 1964}
1664sub find { 2018sub find {
1665 my ($path, $origin) = @_; 2019 my ($path, $origin) = @_;
1666 2020
1667 $path = normalise $path, $origin && $origin->path; 2021 $path = normalise $path, $origin && $origin->path;
1668 2022
2023 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 2024 cf::lock_wait "map_find:$path";
1670 2025
1671 $cf::MAP{$path} || do { 2026 $cf::MAP{$path} || do {
1672 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
1673 my $map = new_from_path cf::map $path 2030 my $map = new_from_path cf::map $path
1674 or return; 2031 or return;
1675 2032
1676 $map->{last_save} = $cf::RUNTIME; 2033 $map->{last_save} = $cf::RUNTIME;
1677 2034
1679 or return; 2036 or return;
1680 2037
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 2039 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 2040 #$cf::WAIT_FOR_TICK->wait;
2041 undef $guard1;
2042 undef $guard2;
1684 $map->reset; 2043 $map->reset;
1685 undef $guard;
1686 return find $path; 2044 return find $path;
1687 } 2045 }
1688 2046
1689 $cf::MAP{$path} = $map 2047 $cf::MAP{$path} = $map
1690 } 2048 }
1699 local $self->{deny_reset} = 1; # loading can take a long time 2057 local $self->{deny_reset} = 1; # loading can take a long time
1700 2058
1701 my $path = $self->{path}; 2059 my $path = $self->{path};
1702 2060
1703 { 2061 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 2062 my $guard = cf::lock_acquire "map_data:$path";
1705 2063
2064 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2065 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 2066
1708 $self->in_memory (cf::MAP_LOADING); 2067 $self->in_memory (cf::MAP_LOADING);
1709 2068
1710 $self->alloc; 2069 $self->alloc;
1711 2070
1712 $self->pre_load; 2071 $self->pre_load;
1713 Coro::cede; 2072 cf::cede_to_tick;
1714 2073
2074 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2076 $self->_load_objects ($f)
1716 or return; 2077 or return;
1717 2078
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719 if delete $self->{load_original}; 2080 if delete $self->{load_original};
1720 2081
1721 if (my $uniq = $self->uniq_path) { 2082 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2083 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2084 unless (aio_stat $uniq) {
2085 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2086 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2087 $self->_load_objects ($f);
2088 $f->resolve_delayed_derefs;
2089 }
1726 } 2090 }
1727 } 2091 }
1728 2092
1729 Coro::cede; 2093 $f->resolve_delayed_derefs;
2094
2095 cf::cede_to_tick;
1730 # now do the right thing for maps 2096 # now do the right thing for maps
1731 $self->link_multipart_objects; 2097 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2098 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2099 unless $self->difficulty;
1734 Coro::cede; 2100 cf::cede_to_tick;
1735 2101
1736 unless ($self->{deny_activate}) { 2102 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2103 $self->decay_objects;
1738 $self->fix_auto_apply; 2104 $self->fix_auto_apply;
1739 $self->update_buttons; 2105 $self->update_buttons;
1740 Coro::cede; 2106 cf::cede_to_tick;
1741 $self->set_darkness_map; 2107 $self->set_darkness_map;
1742 Coro::cede; 2108 cf::cede_to_tick;
1743 $self->activate; 2109 $self->activate;
1744 } 2110 }
2111
2112 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME);
1745 2114
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2115 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 2116 }
1748 2117
1749 $self->post_load; 2118 $self->post_load;
1760 2129
1761 $self 2130 $self
1762} 2131}
1763 2132
1764# 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
1765sub load_diag { 2134sub load_neighbours {
1766 my ($map) = @_; 2135 my ($map) = @_;
1767 2136
1768 my @diag; # diagonal neighbours 2137 my @neigh; # diagonal neighbours
1769 2138
1770 for (0 .. 3) { 2139 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2140 my $neigh = $map->tile_path ($_)
1772 or next; 2141 or next;
1773 $neigh = find $neigh, $map 2142 $neigh = find $neigh, $map
1774 or next; 2143 or next;
1775 $neigh->load; 2144 $neigh->load;
1776 2145
2146 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2147 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2148 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2149 }
1780 2150
1781 for (@diag) { 2151 for (grep defined $_->[0], @neigh) {
2152 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2153 my $neigh = find $path, $origin
1783 or next; 2154 or next;
1784 $neigh->load; 2155 $neigh->load;
1785 } 2156 }
1786} 2157}
1787 2158
1792} 2163}
1793 2164
1794sub do_load_sync { 2165sub do_load_sync {
1795 my ($map) = @_; 2166 my ($map) = @_;
1796 2167
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main;
2170
1797 cf::sync_job { $map->load }; 2171 cf::sync_job { $map->load };
1798} 2172}
1799 2173
1800our %MAP_PREFETCH; 2174our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2175our $MAP_PREFETCHER = undef;
1802 2176
1803sub find_async { 2177sub find_async {
1804 my ($path, $origin) = @_; 2178 my ($path, $origin, $load) = @_;
1805 2179
1806 $path = normalise $path, $origin && $origin->{path}; 2180 $path = normalise $path, $origin && $origin->{path};
1807 2181
1808 if (my $map = $cf::MAP{$path}) { 2182 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810 } 2184 }
1811 2185
1812 undef $MAP_PREFETCH{$path}; 2186 $MAP_PREFETCH{$path} |= $load;
2187
1813 $MAP_PREFETCHER ||= cf::async { 2188 $MAP_PREFETCHER ||= cf::async {
2189 $Coro::current->{desc} = "map prefetcher";
2190
1814 while (%MAP_PREFETCH) { 2191 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2192 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2193 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2194 $map->load if $v;
2195 }
1819 2196
1820 delete $MAP_PREFETCH{$path}; 2197 delete $MAP_PREFETCH{$k};
1821 } 2198 }
1822 } 2199 }
1823 undef $MAP_PREFETCHER; 2200 undef $MAP_PREFETCHER;
1824 }; 2201 };
1825 $MAP_PREFETCHER->prio (6); 2202 $MAP_PREFETCHER->prio (6);
1828} 2205}
1829 2206
1830sub save { 2207sub save {
1831 my ($self) = @_; 2208 my ($self) = @_;
1832 2209
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2211
1835 $self->{last_save} = $cf::RUNTIME; 2212 $self->{last_save} = $cf::RUNTIME;
1836 2213
1837 return unless $self->dirty; 2214 return unless $self->dirty;
1838 2215
1844 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1845 2222
1846 local $self->{last_access} = $self->last_access;#d# 2223 local $self->{last_access} = $self->last_access;#d#
1847 2224
1848 cf::async { 2225 cf::async {
2226 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2227 $_->contr->save for $self->players;
1850 }; 2228 };
1851 2229
1852 if ($uniq) { 2230 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1861 my ($self) = @_; 2239 my ($self) = @_;
1862 2240
1863 # save first because save cedes 2241 # save first because save cedes
1864 $self->save; 2242 $self->save;
1865 2243
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2245
1868 return if $self->players; 2246 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
1870 return if $self->{deny_save}; 2248 return if $self->{deny_save};
1871 2249
2250 $self->in_memory (cf::MAP_SWAPPED);
2251
2252 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2254 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2255}
1875 2256
1876sub reset_at { 2257sub reset_at {
1877 my ($self) = @_; 2258 my ($self) = @_;
1878 2259
1910 if $uniq; 2291 if $uniq;
1911 } 2292 }
1912 2293
1913 delete $cf::MAP{$self->path}; 2294 delete $cf::MAP{$self->path};
1914 2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2298 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2299
1919 $self->unlink_save; 2300 $self->unlink_save;
1920 $self->destroy; 2301 $self->destroy;
1921} 2302}
1922 2303
1923my $nuke_counter = "aaaa"; 2304my $nuke_counter = "aaaa";
1924 2305
1925sub nuke { 2306sub nuke {
1926 my ($self) = @_; 2307 my ($self) = @_;
1927 2308
2309 {
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
1928 delete $cf::MAP{$self->path}; 2312 delete $cf::MAP{$self->path};
1929 2313
1930 $self->unlink_save; 2314 $self->unlink_save;
1931 2315
1932 bless $self, "cf::map"; 2316 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2317 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2318 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2319 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2321
1938 $cf::MAP{$self->path} = $self; 2322 $cf::MAP{$self->path} = $self;
2323 }
1939 2324
1940 $self->reset; # polite request, might not happen 2325 $self->reset; # polite request, might not happen
1941} 2326}
1942 2327
1943=item $maps = cf::map::tmp_maps 2328=item $maps = cf::map::tmp_maps
1992 : () 2377 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2378 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2379 ]
1995} 2380}
1996 2381
1997package cf;
1998
1999=back 2382=back
2000 2383
2001=head3 cf::object 2384=head3 cf::object
2002 2385
2003=cut 2386=cut
2017 map { $_, inv_recursive_ $_->inv } @_ 2400 map { $_, inv_recursive_ $_->inv } @_
2018} 2401}
2019 2402
2020sub inv_recursive { 2403sub inv_recursive {
2021 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 }
2022} 2433}
2023 2434
2024package cf; 2435package cf;
2025 2436
2026=back 2437=back
2045 2456
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2457 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2458
2048 if ($self->{record_replies}) { 2459 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2460 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2461
2050 } else { 2462 } else {
2463 my $pl = $self->contr;
2464
2465 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2466 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468
2469 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2470 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2471 $self->message ($msg, $flags);
2472 }
2053 } 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 (@_);
2054} 2484}
2055 2485
2056=item $player_object->may ("access") 2486=item $player_object->may ("access")
2057 2487
2058Returns wether the given player is authorized to access resource "access" 2488Returns wether the given player is authorized to access resource "access"
2137 # use -1 or undef as default coordinates, not 0, 0 2567 # use -1 or undef as default coordinates, not 0, 0
2138 ($x, $y) = ($map->enter_x, $map->enter_y) 2568 ($x, $y) = ($map->enter_x, $map->enter_y)
2139 if $x <=0 && $y <= 0; 2569 if $x <=0 && $y <= 0;
2140 2570
2141 $map->load; 2571 $map->load;
2142 $map->load_diag; 2572 $map->load_neighbours;
2143 2573
2144 return unless $self->contr->active; 2574 return unless $self->contr->active;
2145 $self->activate_recursive; 2575 $self->activate_recursive;
2146 2576
2147 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148 $self->enter_map ($map, $x, $y); 2578 $self->enter_map ($map, $x, $y);
2149} 2579}
2150 2580
2151=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152 2582
2153Moves 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
2154her, loading and preparing them map, calling the provided $check callback 2584her, loading and preparing them map, calling the provided $check callback
2155that 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
2156the 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.
2157 2588
2158=cut 2589=cut
2159 2590
2160our $GOTOGEN; 2591our $GOTOGEN;
2161 2592
2162sub cf::object::player::goto { 2593sub cf::object::player::goto {
2163 my ($self, $path, $x, $y, $check) = @_; 2594 my ($self, $path, $x, $y, $check, $done) = @_;
2164 2595
2165 # 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
2166 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167 2598
2168 $self->enter_link; 2599 $self->enter_link;
2169 2600
2170 (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
2171 my $map = eval { 2623 my $map = eval {
2172 my $map = cf::map::find $path; 2624 my $map = defined $path ? cf::map::find $path : undef;
2173 2625
2174 if ($map) { 2626 if ($map) {
2175 $map = $map->customise_for ($self); 2627 $map = $map->customise_for ($self);
2176 $map = $check->($map) if $check && $map; 2628 $map = $check->($map) if $check && $map;
2177 } else { 2629 } else {
2178 $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);
2179 } 2631 }
2180 2632
2181 $map 2633 $map
2182 }; 2634 };
2183 2635
2188 2640
2189 if ($gen == $self->{_goto_generation}) { 2641 if ($gen == $self->{_goto_generation}) {
2190 delete $self->{_goto_generation}; 2642 delete $self->{_goto_generation};
2191 $self->leave_link ($map, $x, $y); 2643 $self->leave_link ($map, $x, $y);
2192 } 2644 }
2645
2646 $done->() if $done;
2193 })->prio (1); 2647 })->prio (1);
2194} 2648}
2195 2649
2196=item $player_object->enter_exit ($exit_object) 2650=item $player_object->enter_exit ($exit_object)
2197 2651
2234 $rmp->{origin_y} = $exit->y; 2688 $rmp->{origin_y} = $exit->y;
2235 } 2689 }
2236 2690
2237 $rmp->{random_seed} ||= $exit->random_seed; 2691 $rmp->{random_seed} ||= $exit->random_seed;
2238 2692
2239 my $data = cf::to_json $rmp; 2693 my $data = cf::encode_json $rmp;
2240 my $md5 = Digest::MD5::md5_hex $data; 2694 my $md5 = Digest::MD5::md5_hex $data;
2241 my $meta = "$RANDOMDIR/$md5.meta"; 2695 my $meta = "$RANDOMDIR/$md5.meta";
2242 2696
2243 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2244 aio_write $fh, 0, (length $data), $data, 0; 2698 aio_write $fh, 0, (length $data), $data, 0;
2266 my $hp = $exit->stats->hp; 2720 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp; 2721 my $sp = $exit->stats->sp;
2268 2722
2269 $self->enter_link; 2723 $self->enter_link;
2270 2724
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2271 (async { 2729 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2731
2272 $self->deactivate_recursive; # just to be sure 2732 $self->deactivate_recursive; # just to be sure
2273 unless (eval { 2733 unless (eval {
2274 $self->goto ($slaying, $hp, $sp); 2734 $self->goto ($slaying, $hp, $sp);
2275 2735
2276 1; 2736 1;
2302 2762
2303 utf8::encode $text; 2763 utf8::encode $text;
2304 $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);
2305} 2765}
2306 2766
2767=item $client->send_msg ($channel, $msg, $color, [extra...])
2768
2769Send a drawinfo or msg packet to the client, formatting the msg for the
2770client if neccessary. C<$type> should be a string identifying the type of
2771the message, with C<log> being the default. If C<$color> is negative, suppress
2772the message unless the client supports the msg packet.
2773
2774=cut
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
2828sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_;
2830
2831 $msg = $self->pl->expand_cfpod ($msg);
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
2855 return unless @extra || length $msg;
2856
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
2862 $self->send_packet ("msg " . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2864 } else {
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
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889}
2890
2307=item $client->ext_event ($type, %msg) 2891=item $client->ext_msg ($type, @msg)
2308 2892
2309Sends an exti event to the client. 2893Sends an ext event to the client.
2310 2894
2311=cut 2895=cut
2312 2896
2313sub cf::client::ext_event($$%) { 2897sub cf::client::ext_msg($$@) {
2314 my ($self, $type, %msg) = @_; 2898 my ($self, $type, @msg) = @_;
2315 2899
2900 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove
2316 $msg{msgtype} = "event_$type"; 2903 push @msg, msgtype => "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%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 }
2318} 2924}
2319 2925
2320=item $success = $client->query ($flags, "text", \&cb) 2926=item $success = $client->query ($flags, "text", \&cb)
2321 2927
2322Queues a query to the client, calling the given callback with 2928Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2929the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2930C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2931
2326Queries can fail, so check the return code. Or don't, as queries will become 2932Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2933become reliable at some point in the future.
2328 2934
2329=cut 2935=cut
2330 2936
2331sub cf::client::query { 2937sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2938 my ($self, $flags, $text, $cb) = @_;
2340 utf8::encode $text; 2946 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2947 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2948
2343 $self->send_packet ($self->{query_queue}[0][0]) 2949 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2950 if @{ $self->{query_queue} } == 1;
2951
2952 1
2345} 2953}
2346 2954
2347cf::client->attach ( 2955cf::client->attach (
2956 on_connect => sub {
2957 my ($ns) = @_;
2958
2959 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2960 },
2348 on_reply => sub { 2961 on_reply => sub {
2349 my ($ns, $msg) = @_; 2962 my ($ns, $msg) = @_;
2350 2963
2351 # this weird shuffling is so that direct followup queries 2964 # this weird shuffling is so that direct followup queries
2352 # get handled first 2965 # get handled first
2364 } else { 2977 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2978 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 2979 }
2367 } 2980 }
2368 }, 2981 },
2982 on_exticmd => sub {
2983 my ($ns, $buf) = @_;
2984
2985 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2986
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
2995 if (my $cb = $EXTICMD{$type}) {
2996 @reply = $cb->($ns, @payload);
2997 }
2998
2999 $ns->ext_reply ($reply, @reply)
3000 if $reply;
3001
3002 } else {
3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3004 }
3005
3006 cf::override;
3007 },
2369); 3008);
2370 3009
2371=item $client->async (\&cb) 3010=item $client->async (\&cb)
2372 3011
2373Create a new coroutine, running the specified callback. The coroutine will 3012Create a new coroutine, running the specified callback. The coroutine will
2414our $safe = new Safe "safe"; 3053our $safe = new Safe "safe";
2415our $safe_hole = new Safe::Hole; 3054our $safe_hole = new Safe::Hole;
2416 3055
2417$SIG{FPE} = 'IGNORE'; 3056$SIG{FPE} = 'IGNORE';
2418 3057
2419$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));
2420 3063
2421# here we export the classes and methods available to script code 3064# here we export the classes and methods available to script code
2422 3065
2423=pod 3066=pod
2424 3067
2425The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2426 3069
2427 cf::object contr pay_amount pay_player map 3070 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr
3073
2428 cf::object::player player 3074 cf::object::player
2429 cf::player peaceful 3075 player
2430 cf::map trigger 3076
3077 cf::player
3078 peaceful
3079
3080 cf::map
3081 trigger
2431 3082
2432=cut 3083=cut
2433 3084
2434for ( 3085for (
2435 ["cf::object" => qw(contr pay_amount pay_player map)], 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
3088 decrease_ob_nr destroy)],
2436 ["cf::object::player" => qw(player)], 3089 ["cf::object::player" => qw(player)],
2437 ["cf::player" => qw(peaceful)], 3090 ["cf::player" => qw(peaceful)],
2438 ["cf::map" => qw(trigger)], 3091 ["cf::map" => qw(trigger)],
2439) { 3092) {
2440 no strict 'refs'; 3093 no strict 'refs';
2516# the server's init and main functions 3169# the server's init and main functions
2517 3170
2518sub load_facedata($) { 3171sub load_facedata($) {
2519 my ($path) = @_; 3172 my ($path) = @_;
2520 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
2521 warn "loading facedata from $path\n"; 3180 warn "loading facedata from $path\n";
2522 3181
2523 my $facedata; 3182 my $facedata;
2524 0 < aio_load $path, $facedata 3183 0 < aio_load $path, $facedata
2525 or die "$path: $!"; 3184 or die "$path: $!";
2527 $facedata = Coro::Storable::thaw $facedata; 3186 $facedata = Coro::Storable::thaw $facedata;
2528 3187
2529 $facedata->{version} == 2 3188 $facedata->{version} == 2
2530 or cf::cleanup "$path: version mismatch, cannot proceed."; 3189 or cf::cleanup "$path: version mismatch, cannot proceed.";
2531 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
2532 { 3198 {
2533 my $faces = $facedata->{faceinfo}; 3199 my $faces = $facedata->{faceinfo};
2534 3200
2535 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2536 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3202 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203
2537 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3204 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap};
2538 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2539 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2540 Coro::cede; 3208
3209 cf::cede_to_tick;
2541 } 3210 }
2542 3211
2543 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2544 next unless $info->{smooth}; 3213 next unless $info->{smooth};
3214
2545 my $idx = cf::face::find $face 3215 my $idx = cf::face::find $face
2546 or next; 3216 or next;
3217
2547 if (my $smooth = cf::face::find $info->{smooth}) { 3218 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth;
2548 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549 } else { 3221 } else {
2550 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3222 warn "smooth face '$info->{smooth}' not found for face '$face'";
2551 } 3223 }
2552 Coro::cede; 3224
3225 cf::cede_to_tick;
2553 } 3226 }
2554 } 3227 }
2555 3228
2556 { 3229 {
2557 my $anims = $facedata->{animinfo}; 3230 my $anims = $facedata->{animinfo};
2558 3231
2559 while (my ($anim, $info) = each %$anims) { 3232 while (my ($anim, $info) = each %$anims) {
2560 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3233 cf::anim::set $anim, $info->{frames}, $info->{facings};
2561 Coro::cede; 3234 cf::cede_to_tick;
2562 } 3235 }
2563 3236
2564 cf::anim::invalidate_all; # d'oh 3237 cf::anim::invalidate_all; # d'oh
2565 } 3238 }
2566 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
2567 1 3275 1
2568} 3276}
2569 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
2570sub 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
2571 load_resource_file "$MAPDIR/regions" 3311 load_resource_file "$MAPDIR/regions"
2572 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 }
2573} 3318}
2574 3319
2575sub reload_facedata { 3320sub reload_facedata {
2576 load_facedata "$DATADIR/facedata" 3321 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 3322 or die "unable to load facedata\n";
2578} 3323}
2579 3324
2580sub reload_archetypes { 3325sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
2581 load_resource_file "$DATADIR/archetypes" 3331 load_resource_file "$DATADIR/archetypes"
2582 or die "unable to load archetypes\n"; 3332 or die "unable to load archetypes\n";
2583} 3333}
2584 3334
2585sub reload_treasures { 3335sub reload_treasures {
2601 3351
2602sub init { 3352sub init {
2603 reload_resources; 3353 reload_resources;
2604} 3354}
2605 3355
2606sub cfg_load { 3356sub reload_config {
2607 open my $fh, "<:utf8", "$CONFDIR/config" 3357 open my $fh, "<:utf8", "$CONFDIR/config"
2608 or return; 3358 or return;
2609 3359
2610 local $/; 3360 local $/;
2611 *CFG = YAML::Syck::Load <$fh>; 3361 *CFG = YAML::Load <$fh>;
2612 3362
2613 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2614 3364
2615 $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};
2616 $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};
2627sub main { 3377sub main {
2628 # we must not ever block the main coroutine 3378 # we must not ever block the main coroutine
2629 local $Coro::idle = sub { 3379 local $Coro::idle = sub {
2630 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#
2631 (async { 3381 (async {
2632 Event::one_event; 3382 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT;
2633 })->prio (Coro::PRIO_MAX); 3384 })->prio (Coro::PRIO_MAX);
2634 }; 3385 };
2635 3386
2636 cfg_load; 3387 reload_config;
2637 db_init; 3388 db_init;
2638 load_extensions; 3389 load_extensions;
2639 3390
2640 $TICK_WATCHER->start; 3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno;
2641 Event::loop; 3393 EV::loop;
2642} 3394}
2643 3395
2644############################################################################# 3396#############################################################################
2645# initialisation and cleanup 3397# initialisation and cleanup
2646 3398
2647# install some emergency cleanup handlers 3399# install some emergency cleanup handlers
2648BEGIN { 3400BEGIN {
3401 our %SIGWATCHER = ();
2649 for my $signal (qw(INT HUP TERM)) { 3402 for my $signal (qw(INT HUP TERM)) {
2650 Event->signal ( 3403 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2651 reentrant => 0,
2652 data => WF_AUTOCANCEL,
2653 signal => $signal,
2654 prio => 0,
2655 cb => sub {
2656 cf::cleanup "SIG$signal"; 3404 cf::cleanup "SIG$signal";
2657 },
2658 ); 3405 };
2659 } 3406 }
2660} 3407}
2661 3408
2662sub write_runtime { 3409sub write_runtime {
2663 my $runtime = "$LOCALDIR/runtime"; 3410 my $runtime = "$LOCALDIR/runtime";
2693 and return; 3440 and return;
2694 3441
2695 warn "runtime file written.\n"; 3442 warn "runtime file written.\n";
2696 3443
2697 1 3444 1
3445}
3446
3447our $uuid_lock;
3448our $uuid_skip;
3449
3450sub write_uuid_sync($) {
3451 $uuid_skip ||= $_[0];
3452
3453 return if $uuid_lock;
3454 local $uuid_lock = 1;
3455
3456 my $uuid = "$LOCALDIR/uuid";
3457
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return;
3460
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3462 $uuid_skip = 0;
3463
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return;
3466
3467 # always fsync - this file is important
3468 aio_fsync $fh
3469 and return;
3470
3471 close $fh
3472 or return;
3473
3474 aio_rename "$uuid~", $uuid
3475 and return;
3476
3477 warn "uuid file written ($value).\n";
3478
3479 1
3480
3481}
3482
3483sub write_uuid($$) {
3484 my ($skip, $sync) = @_;
3485
3486 $sync ? write_uuid_sync $skip
3487 : async { write_uuid_sync $skip };
2698} 3488}
2699 3489
2700sub emergency_save() { 3490sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3491 my $freeze_guard = cf::freeze_mainloop;
2702 3492
2708 # and maps saved/destroyed asynchronously. 3498 # and maps saved/destroyed asynchronously.
2709 warn "begin emergency player save\n"; 3499 warn "begin emergency player save\n";
2710 for my $login (keys %cf::PLAYER) { 3500 for my $login (keys %cf::PLAYER) {
2711 my $pl = $cf::PLAYER{$login} or next; 3501 my $pl = $cf::PLAYER{$login} or next;
2712 $pl->valid or next; 3502 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713 $pl->save; 3504 $pl->save;
2714 } 3505 }
2715 warn "end emergency player save\n"; 3506 warn "end emergency player save\n";
2716 3507
2717 warn "begin emergency map save\n"; 3508 warn "begin emergency map save\n";
2723 warn "end emergency map save\n"; 3514 warn "end emergency map save\n";
2724 3515
2725 warn "begin emergency database checkpoint\n"; 3516 warn "begin emergency database checkpoint\n";
2726 BDB::db_env_txn_checkpoint $DB_ENV; 3517 BDB::db_env_txn_checkpoint $DB_ENV;
2727 warn "end emergency database checkpoint\n"; 3518 warn "end emergency database checkpoint\n";
3519
3520 warn "begin write uuid\n";
3521 write_uuid_sync 1;
3522 warn "end write uuid\n";
2728 }; 3523 };
2729 3524
2730 warn "leave emergency perl save\n"; 3525 warn "leave emergency perl save\n";
2731} 3526}
2732 3527
2756 warn "syncing database to disk"; 3551 warn "syncing database to disk";
2757 BDB::db_env_txn_checkpoint $DB_ENV; 3552 BDB::db_env_txn_checkpoint $DB_ENV;
2758 3553
2759 # if anything goes wrong in here, we should simply crash as we already saved 3554 # if anything goes wrong in here, we should simply crash as we already saved
2760 3555
2761 warn "cancelling all WF_AUTOCANCEL watchers";
2762 for (Event::all_watchers) {
2763 $_->cancel if $_->data & WF_AUTOCANCEL;
2764 }
2765
2766 warn "flushing outstanding aio requests"; 3556 warn "flushing outstanding aio requests";
2767 for (;;) { 3557 for (;;) {
2768 BDB::flush; 3558 BDB::flush;
2769 IO::AIO::flush; 3559 IO::AIO::flush;
2770 Coro::cede; 3560 Coro::cede_notself;
2771 last unless IO::AIO::nreqs || BDB::nreqs; 3561 last unless IO::AIO::nreqs || BDB::nreqs;
2772 warn "iterate..."; 3562 warn "iterate...";
2773 } 3563 }
2774 3564
2775 ++$RELOAD; 3565 ++$RELOAD;
2779 %EXT_CORO = (); 3569 %EXT_CORO = ();
2780 3570
2781 warn "removing commands"; 3571 warn "removing commands";
2782 %COMMAND = (); 3572 %COMMAND = ();
2783 3573
2784 warn "removing ext commands"; 3574 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3575 %EXTCMD = ();
3576 %EXTICMD = ();
2786 3577
2787 warn "unloading/nuking all extensions"; 3578 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3579 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3580 warn "... unloading $pkg";
2790 3581
2833 warn "reloading cf.pm"; 3624 warn "reloading cf.pm";
2834 require cf; 3625 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3627
2837 warn "loading config and database again"; 3628 warn "loading config and database again";
2838 cf::cfg_load; 3629 cf::reload_config;
2839 3630
2840 warn "loading extensions"; 3631 warn "loading extensions";
2841 cf::load_extensions; 3632 cf::load_extensions;
2842 3633
2843 warn "reattaching attachments to objects/players"; 3634 warn "reattaching attachments to objects/players";
2850 warn "leaving sync_job"; 3641 warn "leaving sync_job";
2851 3642
2852 1 3643 1
2853 } or do { 3644 } or do {
2854 warn $@; 3645 warn $@;
2855 warn "error while reloading, exiting."; 3646 cf::cleanup "error while reloading, exiting.";
2856 exit 1;
2857 }; 3647 };
2858 3648
2859 warn "reloaded"; 3649 warn "reloaded";
2860}; 3650};
2861 3651
2863 3653
2864sub reload_perl() { 3654sub reload_perl() {
2865 # doing reload synchronously and two reloads happen back-to-back, 3655 # doing reload synchronously and two reloads happen back-to-back,
2866 # coro crashes during coro_state_free->destroy here. 3656 # coro crashes during coro_state_free->destroy here.
2867 3657
2868 $RELOAD_WATCHER ||= Event->timer ( 3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2869 reentrant => 0,
2870 after => 0,
2871 data => WF_AUTOCANCEL,
2872 cb => sub {
2873 do_reload_perl; 3659 do_reload_perl;
2874 undef $RELOAD_WATCHER; 3660 undef $RELOAD_WATCHER;
2875 },
2876 ); 3661 };
2877} 3662}
2878 3663
2879register_command "reload" => sub { 3664register_command "reload" => sub {
2880 my ($who, $arg) = @_; 3665 my ($who, $arg) = @_;
2881 3666
2882 if ($who->flag (FLAG_WIZ)) { 3667 if ($who->flag (FLAG_WIZ)) {
2883 $who->message ("reloading server."); 3668 $who->message ("reloading server.");
3669 async {
3670 $Coro::current->{desc} = "perl_reload";
2884 async { reload_perl }; 3671 reload_perl;
3672 };
2885 } 3673 }
2886}; 3674};
2887 3675
2888unshift @INC, $LIBDIR; 3676unshift @INC, $LIBDIR;
2889 3677
2891 3679
2892our @WAIT_FOR_TICK; 3680our @WAIT_FOR_TICK;
2893our @WAIT_FOR_TICK_BEGIN; 3681our @WAIT_FOR_TICK_BEGIN;
2894 3682
2895sub wait_for_tick { 3683sub wait_for_tick {
2896 return unless $TICK_WATCHER->is_active; 3684 return if tick_inhibit;
2897 return if $Coro::current == $Coro::main; 3685 return if $Coro::current == $Coro::main;
2898 3686
2899 my $signal = new Coro::Signal; 3687 my $signal = new Coro::Signal;
2900 push @WAIT_FOR_TICK, $signal; 3688 push @WAIT_FOR_TICK, $signal;
2901 $signal->wait; 3689 $signal->wait;
2902} 3690}
2903 3691
2904sub wait_for_tick_begin { 3692sub wait_for_tick_begin {
2905 return unless $TICK_WATCHER->is_active; 3693 return if tick_inhibit;
2906 return if $Coro::current == $Coro::main; 3694 return if $Coro::current == $Coro::main;
2907 3695
2908 my $signal = new Coro::Signal; 3696 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal; 3697 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait; 3698 $signal->wait;
2911} 3699}
2912 3700
2913 my $min = 1e6;#d# 3701sub tick {
2914 my $avg = 10;
2915$TICK_WATCHER = Event->timer (
2916 reentrant => 0,
2917 parked => 1,
2918 prio => 0,
2919 at => $NEXT_TICK || $TICK,
2920 data => WF_AUTOCANCEL,
2921 cb => sub {
2922 if ($Coro::current != $Coro::main) { 3702 if ($Coro::current != $Coro::main) {
2923 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3703 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2924 unless ++$bug_warning > 10; 3704 unless ++$bug_warning > 10;
2925 return; 3705 return;
2926 } 3706 }
2927 3707
2928 $NOW = $tick_start = Event::time;
2929
2930 cf::server_tick; # one server iteration 3708 cf::server_tick; # one server iteration
2931 3709
2932 0 && sync_job {#d# 3710 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2933 for(1..10) { 3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2934 my $t = Event::time; 3712 Coro::async_pool {
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3713 $Coro::current->{desc} = "runtime saver";
2936 or die; 3714 write_runtime
2937 3715 or warn "ERROR: unable to write runtime file: $!";
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 }; 3716 };
3717 }
2954 3718
2955 $RUNTIME += $TICK;
2956 $NEXT_TICK += $TICK;
2957
2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool {
2961 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!";
2963 };
2964 }
2965
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send; 3720 $sig->send;
2971 } 3721 }
2972 while (my $sig = shift @WAIT_FOR_TICK) { 3722 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send; 3723 $sig->send;
2974 } 3724 }
2975 3725
2976 $NOW = Event::time; 3726 $LOAD = ($NOW - $TICK_START) / $TICK;
2977
2978 # if we are delayed by four ticks or more, skip them all
2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2980
2981 $TICK_WATCHER->at ($NEXT_TICK);
2982 $TICK_WATCHER->start;
2983
2984 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3727 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986 3728
2987 _post_tick; 3729 if (0) {
2988 3730 if ($NEXT_TICK) {
2989 3731 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d#
3734 }
2990 }, 3735 }
2991); 3736}
2992 3737
2993{ 3738{
2994 BDB::max_poll_time $TICK * 0.1; 3739 # configure BDB
2995 $BDB_POLL_WATCHER = Event->io ( 3740
2996 reentrant => 0,
2997 fd => BDB::poll_fileno,
2998 poll => 'r',
2999 prio => 0,
3000 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb,
3002 );
3003 BDB::min_parallel 8; 3741 BDB::min_parallel 8;
3004 3742 BDB::max_poll_reqs $TICK * 0.1;
3005 BDB::set_sync_prepare { 3743 $Coro::BDB::WATCHER->priority (1);
3006 my $status;
3007 my $current = $Coro::current;
3008 (
3009 sub {
3010 $status = $!;
3011 $current->ready; undef $current;
3012 },
3013 sub {
3014 Coro::schedule while defined $current;
3015 $! = $status;
3016 },
3017 )
3018 };
3019 3744
3020 unless ($DB_ENV) { 3745 unless ($DB_ENV) {
3021 $DB_ENV = BDB::db_env_create; 3746 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3748 | BDB::LOG_AUTOREMOVE, 1);
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3022 3751
3023 cf::sync_job { 3752 cf::sync_job {
3024 eval { 3753 eval {
3025 BDB::db_env_open 3754 BDB::db_env_open
3026 $DB_ENV, 3755 $DB_ENV,
3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3757 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3758 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666; 3759 0666;
3031 3760
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3761 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035 $DB_ENV->set_lk_detect;
3036 }; 3762 };
3037 3763
3038 cf::cleanup "db_env_open(db): $@" if $@; 3764 cf::cleanup "db_env_open(db): $@" if $@;
3039 }; 3765 };
3040 } 3766 }
3767
3768 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3769 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3770 };
3771 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3772 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3773 };
3774 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3775 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3776 };
3041} 3777}
3042 3778
3043{ 3779{
3780 # configure IO::AIO
3781
3044 IO::AIO::min_parallel 8; 3782 IO::AIO::min_parallel 8;
3045
3046 undef $Coro::AIO::WATCHER;
3047 IO::AIO::max_poll_time $TICK * 0.1; 3783 IO::AIO::max_poll_time $TICK * 0.1;
3048 $AIO_POLL_WATCHER = Event->io ( 3784 $Coro::AIO::WATCHER->priority (1);
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 fd => IO::AIO::poll_fileno,
3052 poll => 'r',
3053 prio => 6,
3054 cb => \&IO::AIO::poll_cb,
3055 );
3056} 3785}
3057 3786
3058my $_log_backtrace; 3787my $_log_backtrace;
3059 3788
3060sub _log_backtrace { 3789sub _log_backtrace {
3064 3793
3065 # limit the # of concurrent backtraces 3794 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) { 3795 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace; 3796 ++$_log_backtrace;
3068 async { 3797 async {
3798 $Coro::current->{desc} = "abt $msg";
3799
3069 my @bt = fork_call { 3800 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr; 3801 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3802 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3803 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!"; 3804 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines