ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.417 by root, Fri Apr 11 14:09:57 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
34 58
35# configure various modules to our taste 59# configure various modules to our taste
36# 60#
37$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 104our $DB_ENV;
84 105
85our %CFG; 106our %CFG;
86 107
87our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 109our $RUNTIME;
110our $NOW;
89 111
90our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
93 115
94# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 118
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
100 123
101binmode STDOUT; 124binmode STDOUT;
102binmode STDERR; 125binmode STDERR;
103 126
104# read virtual server time, if available 127# read virtual server time, if available
157 180
158The raw value load value from the last tick. 181The raw value load value from the last tick.
159 182
160=item %cf::CFG 183=item %cf::CFG
161 184
162Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 186from wherever your confdir points to.
164 187
165=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
166 189
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
171=back 200=back
172 201
173=cut 202=cut
174 203
175BEGIN { 204BEGIN {
179 $msg .= "\n" 208 $msg .= "\n"
180 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
181 210
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 212
184 utf8::encode $msg;
185 LOG llevError, $msg; 213 LOG llevError, $msg;
186 }; 214 };
187} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
188 231
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 248)) {
206 no strict 'refs'; 249 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 251}
209 252
210$Event::DIED = sub { 253$EV::DIED = sub {
211 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
212}; 255};
213 256
214############################################################################# 257#############################################################################
215 258
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 282 $d
240 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
241} 284}
242 285
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
250 293
251=cut 294=cut
252 295
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 297
255sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
257 300
258=item cf::lock_wait $string 301=item cf::lock_wait $string
259 302
260Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
261 304
264Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
267returned. 310returned.
268 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
269Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
271 317
272=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
273 319
274Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
275 321
276=cut 322=cut
277 323
278our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
279 326
280sub lock_wait($) { 327sub lock_wait($) {
281 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
282 334
283 # wait for lock, if any 335 # wait for lock, if any
284 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 338 Coro::schedule;
292 344
293 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
294 lock_wait $key; 346 lock_wait $key;
295 347
296 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
297 350
298 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
301 } 355 }
302} 356}
303 357
306 360
307 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
308} 362}
309 363
310sub freeze_mainloop { 364sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
312 366
313 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
314 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
315 }; 428 }
316 $TICK_WATCHER->stop; 429};
317 $guard 430
431sub get_slot($;$$) {
432 my ($time, $pri, $name) = @_;
433
434 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal;
436
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready;
440 $sig->wait;
318} 441}
319 442
320=item cf::async { BLOCK } 443=item cf::async { BLOCK }
321 444
322Currently the same as Coro::async_pool, meaning you cannot use 445Currently the same as Coro::async_pool, meaning you cannot use
327 450
328BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
329 452
330=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
331 454
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 458acceptable.
336 459
337If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
343 466
344sub sync_job(&) { 467sub sync_job(&) {
345 my ($job) = @_; 468 my ($job) = @_;
346 469
347 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 471 my $time = EV::time;
349 472
350 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
352 475
353 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 477
355 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
356 479
357 my $busy = 1; 480 my $busy = 1;
358 my @res; 481 my @res;
359 482
360 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 485 @res = eval { $job->() };
362 warn $@ if $@; 486 warn $@ if $@;
363 undef $busy; 487 undef $busy;
364 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
365 489
366 while ($busy) { 490 while ($busy) {
367 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
368 } 495 }
496 }
369 497
370 $time = Event::time - $time; 498 my $time = EV::time - $time;
371 499
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
376 501
377 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
378 } else { 503 } else {
379 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
380 505
405=item fork_call { }, $args 530=item fork_call { }, $args
406 531
407Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
411 536
412=cut 537=cut
413 538
414sub fork_call(&@) { 539sub fork_call(&@) {
415 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
416 541
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 545
422 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 547 reset_signals;
436 local $SIG{__WARN__}; 548 &$cb
437 local $SIG{__DIE__}; 549 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 550
443 my @res = eval { $cb->(@args) }; 551 wantarray ? @res : $res[-1]
552}
444 553
445 open my $fh, ">", \my $buf 554=item $coin = coin_from_name $name
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449 555
450 warn "writing ", length $buf; 556=cut
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456 557
457 warn $@ if $@; 558our %coin_alias = (
458 _exit 0; 559 "silver" => "silvercoin",
459 } 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
460} 579}
461 580
462=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
463 582
464Returns a single value from the environment database. 583Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
467 586
468Stores 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
469data 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).
470 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
471=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}
472 613
473our $DB; 614our $DB;
474 615
475sub db_init { 616sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 617 cf::sync_job {
480 eval { 618 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 619 };
490} 620}
491 621
492sub db_get($$) { 622sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
494 624
544 if (1) { 674 if (1) {
545 $md5 = 675 $md5 =
546 join "\x00", 676 join "\x00",
547 $processversion, 677 $processversion,
548 map { 678 map {
549 Coro::cede; 679 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 680 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 681 } 0.. $#$src;
552 682
553 683
554 my $dbmd5 = db_get cache => "$id/md5"; 684 my $dbmd5 = db_get cache => "$id/md5";
598attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
600 730
601In 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>
602C<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
603Crossfire TRT). 733Deliantra).
604 734
605=over 4 735=over 4
606 736
607=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
608 738
860 "; 990 ";
861 die if $@; 991 die if $@;
862} 992}
863 993
864our $override; 994our $override;
865our @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?
866 996
867sub override { 997sub override {
868 $override = 1; 998 $override = 1;
869 @invoke_results = (); 999 @INVOKE_RESULTS = (@_);
870} 1000}
871 1001
872sub do_invoke { 1002sub do_invoke {
873 my $event = shift; 1003 my $event = shift;
874 my $callbacks = shift; 1004 my $callbacks = shift;
875 1005
876 @invoke_results = (); 1006 @INVOKE_RESULTS = ();
877 1007
878 local $override; 1008 local $override;
879 1009
880 for (@$callbacks) { 1010 for (@$callbacks) {
881 eval { &{$_->[1]} }; 1011 eval { &{$_->[1]} };
890 } 1020 }
891 1021
892 0 1022 0
893} 1023}
894 1024
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 1026
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1028
899Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
900 1030
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 1033results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1034
905=back 1035=back
906 1036
907=cut 1037=cut
908 1038
909############################################################################# 1039#############################################################################
910# 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}
911 1083
912sub reattach { 1084sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1086 my ($obj) = @_;
915 1087
936cf::attachable->attach ( 1108cf::attachable->attach (
937 prio => -1000000, 1109 prio => -1000000,
938 on_instantiate => sub { 1110 on_instantiate => sub {
939 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
940 1112
941 $data = from_json $data; 1113 $data = decode_json $data;
942 1114
943 for (@$data) { 1115 for (@$data) {
944 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
945 1117
946 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1134sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
964 1136
965 sync_job { 1137 sync_job {
966 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
969 1142
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
974 close $fh; 1147 close $fh;
975 1148
976 if (@$objs) { 1149 if (@$objs) {
977 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) {
978 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
981 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
982 close $fh; 1155 close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
984 } 1157 }
992 } 1165 }
993 } else { 1166 } else {
994 aio_unlink $filename; 1167 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
996 } 1169 }
997 } 1170 };
998} 1171}
999 1172
1000sub object_freezer_as_string { 1173sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1002 1175
1014 or return; 1187 or return;
1015 1188
1016 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1191 or return;
1192
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1020 } 1195 }
1021 1196
1197 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1024 return ($data, $av); 1201 ($data, $av)
1025} 1202}
1026 1203
1027=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1028 1205
1029=over 4 1206=over 4
1102 my ($pl, $buf) = @_; 1279 my ($pl, $buf) = @_;
1103 1280
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1281 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1282
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1291 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1292 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1293 }
1294
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1112 } else { 1298 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1300 }
1115 1301
1116 cf::override; 1302 cf::override;
1169 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1170 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1171 1357
1172 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1173 warn $msg; 1359 warn $msg;
1174 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1175 exit 1;
1176 } 1361 }
1177 1362
1178 warn $msg; 1363 warn $msg;
1179 } 1364 }
1180 1365
1205use Coro::AIO; 1390use Coro::AIO;
1206 1391
1207=head3 cf::player 1392=head3 cf::player
1208 1393
1209=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}
1210 1409
1211=item cf::player::find $login 1410=item cf::player::find $login
1212 1411
1213Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1214 1413
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1453
1255 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1258 } 1462 }
1259 } 1463 }
1260} 1464}
1261 1465
1271 1475
1272 aio_mkdir playerdir $pl, 0770; 1476 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1477 $pl->{last_save} = $cf::RUNTIME;
1274 1478
1275 $pl->save_pl ($path); 1479 $pl->save_pl ($path);
1276 Coro::cede; 1480 cf::cede_to_tick;
1277} 1481}
1278 1482
1279sub new($) { 1483sub new($) {
1280 my ($login) = @_; 1484 my ($login) = @_;
1281 1485
1285 $self->{deny_save} = 1; 1489 $self->{deny_save} = 1;
1286 1490
1287 $cf::PLAYER{$login} = $self; 1491 $cf::PLAYER{$login} = $self;
1288 1492
1289 $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 (@_);
1290} 1504}
1291 1505
1292=item $pl->quit_character 1506=item $pl->quit_character
1293 1507
1294Nukes the player without looking back. If logged in, the connection will 1508Nukes the player without looking back. If logged in, the connection will
1349 or return []; 1563 or return [];
1350 1564
1351 my @logins; 1565 my @logins;
1352 1566
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1357 1576
1358 utf8::decode $login; 1577 utf8::decode $login;
1359 push @logins, $login; 1578 push @logins, $login;
1360 } 1579 }
1361 1580
1394 1613
1395Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1396 1615
1397=cut 1616=cut
1398 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
1399sub expand_cfpod { 1629sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1401 1631
1402 # escape & and < 1632 my $xml;
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405 1633
1406 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1407 1637
1408 1 while 1638 $group =~ s/&/&amp;/g;
1409 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1413 # replace G<male|female> tags 1643 ([BCGHITU])
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1644 <
1415 $self->gender ? $2 : $1 1645 (?:
1416 }ge 1646 ([^<>]*) (?{ $group = $^N })
1417 # replace H<hint text> 1647 | < $interior >
1418 || s{H<([^\>]*)>} 1648 )
1649 >
1650 %gcsx
1419 { 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") {
1420 ("<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>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "") 1671 "")
1423 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1424 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1425 1683
1684 for ($xml) {
1426 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1428 1687
1429 # compress some whitespace 1688 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1434 1694
1435 $_ 1695 $xml
1436} 1696}
1697
1698no re 'eval';
1437 1699
1438sub hintmode { 1700sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1702 $_[0]{hintmode}
1441} 1703}
1442 1704
1443=item $player->ext_reply ($msgid, %msg) 1705=item $player->ext_reply ($msgid, @msg)
1444 1706
1445Sends an ext reply to the player. 1707Sends an ext reply to the player.
1446 1708
1447=cut 1709=cut
1448 1710
1449sub ext_reply($$%) { 1711sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1712 my ($self, $id, @msg) = @_;
1451 1713
1452 $msg{msgid} = $id; 1714 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1715}
1455 1716
1456=item $player->ext_event ($type, %msg) 1717=item $player->ext_msg ($type, @msg)
1457 1718
1458Sends an ext event to the client. 1719Sends an ext event to the client.
1459 1720
1460=cut 1721=cut
1461 1722
1462sub ext_event($$%) { 1723sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1724 my ($self, $type, @msg) = @_;
1464 1725
1465 $self->ns->ext_event ($type, %msg); 1726 $self->ns->ext_msg ($type, @msg);
1466} 1727}
1467 1728
1468=head3 cf::region 1729=head3 cf::region
1469 1730
1470=over 4 1731=over 4
1483 my ($path) = @_; 1744 my ($path) = @_;
1484 1745
1485 my ($match, $specificity); 1746 my ($match, $specificity);
1486 1747
1487 for my $region (list) { 1748 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1749 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1750 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1751 if $region->specificity > $specificity;
1491 } 1752 }
1492 } 1753 }
1493 1754
1613 $self->init; # pass $1 etc. 1874 $self->init; # pass $1 etc.
1614 return $self; 1875 return $self;
1615 } 1876 }
1616 } 1877 }
1617 1878
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1879 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1880 ()
1620} 1881}
1621 1882
1622sub init { 1883sub init {
1623 my ($self) = @_; 1884 my ($self) = @_;
1686 1947
1687sub load_header_from($) { 1948sub load_header_from($) {
1688 my ($self, $path) = @_; 1949 my ($self, $path) = @_;
1689 1950
1690 utf8::encode $path; 1951 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1952 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 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;
1696 1960
1697 $self->{load_path} = $path; 1961 $self->{load_path} = $path;
1698 1962
1699 1 1963 1
1700} 1964}
1754sub find { 2018sub find {
1755 my ($path, $origin) = @_; 2019 my ($path, $origin) = @_;
1756 2020
1757 $path = normalise $path, $origin && $origin->path; 2021 $path = normalise $path, $origin && $origin->path;
1758 2022
2023 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 2024 cf::lock_wait "map_find:$path";
1760 2025
1761 $cf::MAP{$path} || do { 2026 $cf::MAP{$path} || do {
1762 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
1763 my $map = new_from_path cf::map $path 2030 my $map = new_from_path cf::map $path
1764 or return; 2031 or return;
1765 2032
1766 $map->{last_save} = $cf::RUNTIME; 2033 $map->{last_save} = $cf::RUNTIME;
1767 2034
1769 or return; 2036 or return;
1770 2037
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 2039 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 2040 #$cf::WAIT_FOR_TICK->wait;
2041 undef $guard1;
2042 undef $guard2;
1774 $map->reset; 2043 $map->reset;
1775 undef $guard;
1776 return find $path; 2044 return find $path;
1777 } 2045 }
1778 2046
1779 $cf::MAP{$path} = $map 2047 $cf::MAP{$path} = $map
1780 } 2048 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 2057 local $self->{deny_reset} = 1; # loading can take a long time
1790 2058
1791 my $path = $self->{path}; 2059 my $path = $self->{path};
1792 2060
1793 { 2061 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2062 my $guard = cf::lock_acquire "map_data:$path";
1795 2063
2064 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2065 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2066
1798 $self->in_memory (cf::MAP_LOADING); 2067 $self->in_memory (cf::MAP_LOADING);
1799 2068
1800 $self->alloc; 2069 $self->alloc;
1801 2070
1802 $self->pre_load; 2071 $self->pre_load;
1803 Coro::cede; 2072 cf::cede_to_tick;
1804 2073
2074 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2076 $self->_load_objects ($f)
1806 or return; 2077 or return;
1807 2078
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 2080 if delete $self->{load_original};
1810 2081
1811 if (my $uniq = $self->uniq_path) { 2082 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2083 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2084 unless (aio_stat $uniq) {
2085 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2086 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2087 $self->_load_objects ($f);
2088 $f->resolve_delayed_derefs;
2089 }
1816 } 2090 }
1817 } 2091 }
1818 2092
1819 Coro::cede; 2093 $f->resolve_delayed_derefs;
2094
2095 cf::cede_to_tick;
1820 # now do the right thing for maps 2096 # now do the right thing for maps
1821 $self->link_multipart_objects; 2097 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2098 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2099 unless $self->difficulty;
1824 Coro::cede; 2100 cf::cede_to_tick;
1825 2101
1826 unless ($self->{deny_activate}) { 2102 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2103 $self->decay_objects;
1828 $self->fix_auto_apply; 2104 $self->fix_auto_apply;
1829 $self->update_buttons; 2105 $self->update_buttons;
1830 Coro::cede; 2106 cf::cede_to_tick;
1831 $self->set_darkness_map; 2107 $self->set_darkness_map;
1832 Coro::cede; 2108 cf::cede_to_tick;
1833 $self->activate; 2109 $self->activate;
1834 } 2110 }
2111
2112 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME);
1835 2114
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2115 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 2116 }
1838 2117
1839 $self->post_load; 2118 $self->post_load;
1850 2129
1851 $self 2130 $self
1852} 2131}
1853 2132
1854# 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
1855sub load_diag { 2134sub load_neighbours {
1856 my ($map) = @_; 2135 my ($map) = @_;
1857 2136
1858 my @diag; # diagonal neighbours 2137 my @neigh; # diagonal neighbours
1859 2138
1860 for (0 .. 3) { 2139 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2140 my $neigh = $map->tile_path ($_)
1862 or next; 2141 or next;
1863 $neigh = find $neigh, $map 2142 $neigh = find $neigh, $map
1864 or next; 2143 or next;
1865 $neigh->load; 2144 $neigh->load;
1866 2145
2146 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2147 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2148 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2149 }
1870 2150
1871 for (@diag) { 2151 for (grep defined $_->[0], @neigh) {
2152 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2153 my $neigh = find $path, $origin
1873 or next; 2154 or next;
1874 $neigh->load; 2155 $neigh->load;
1875 } 2156 }
1876} 2157}
1877 2158
1882} 2163}
1883 2164
1884sub do_load_sync { 2165sub do_load_sync {
1885 my ($map) = @_; 2166 my ($map) = @_;
1886 2167
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main;
2170
1887 cf::sync_job { $map->load }; 2171 cf::sync_job { $map->load };
1888} 2172}
1889 2173
1890our %MAP_PREFETCH; 2174our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2175our $MAP_PREFETCHER = undef;
1892 2176
1893sub find_async { 2177sub find_async {
1894 my ($path, $origin) = @_; 2178 my ($path, $origin, $load) = @_;
1895 2179
1896 $path = normalise $path, $origin && $origin->{path}; 2180 $path = normalise $path, $origin && $origin->{path};
1897 2181
1898 if (my $map = $cf::MAP{$path}) { 2182 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2184 }
1901 2185
1902 undef $MAP_PREFETCH{$path}; 2186 $MAP_PREFETCH{$path} |= $load;
2187
1903 $MAP_PREFETCHER ||= cf::async { 2188 $MAP_PREFETCHER ||= cf::async {
2189 $Coro::current->{desc} = "map prefetcher";
2190
1904 while (%MAP_PREFETCH) { 2191 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2192 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2193 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2194 $map->load if $v;
2195 }
1909 2196
1910 delete $MAP_PREFETCH{$path}; 2197 delete $MAP_PREFETCH{$k};
1911 } 2198 }
1912 } 2199 }
1913 undef $MAP_PREFETCHER; 2200 undef $MAP_PREFETCHER;
1914 }; 2201 };
1915 $MAP_PREFETCHER->prio (6); 2202 $MAP_PREFETCHER->prio (6);
1918} 2205}
1919 2206
1920sub save { 2207sub save {
1921 my ($self) = @_; 2208 my ($self) = @_;
1922 2209
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2211
1925 $self->{last_save} = $cf::RUNTIME; 2212 $self->{last_save} = $cf::RUNTIME;
1926 2213
1927 return unless $self->dirty; 2214 return unless $self->dirty;
1928 2215
1934 return if $self->{deny_save}; 2221 return if $self->{deny_save};
1935 2222
1936 local $self->{last_access} = $self->last_access;#d# 2223 local $self->{last_access} = $self->last_access;#d#
1937 2224
1938 cf::async { 2225 cf::async {
2226 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2227 $_->contr->save for $self->players;
1940 }; 2228 };
1941 2229
1942 if ($uniq) { 2230 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1951 my ($self) = @_; 2239 my ($self) = @_;
1952 2240
1953 # save first because save cedes 2241 # save first because save cedes
1954 $self->save; 2242 $self->save;
1955 2243
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2245
1958 return if $self->players; 2246 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2248 return if $self->{deny_save};
1961 2249
2250 $self->in_memory (cf::MAP_SWAPPED);
2251
2252 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2254 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2255}
1965 2256
1966sub reset_at { 2257sub reset_at {
1967 my ($self) = @_; 2258 my ($self) = @_;
1968 2259
2000 if $uniq; 2291 if $uniq;
2001 } 2292 }
2002 2293
2003 delete $cf::MAP{$self->path}; 2294 delete $cf::MAP{$self->path};
2004 2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2298 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2299
2009 $self->unlink_save; 2300 $self->unlink_save;
2010 $self->destroy; 2301 $self->destroy;
2011} 2302}
2012 2303
2013my $nuke_counter = "aaaa"; 2304my $nuke_counter = "aaaa";
2014 2305
2015sub nuke { 2306sub nuke {
2016 my ($self) = @_; 2307 my ($self) = @_;
2017 2308
2309 {
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2018 delete $cf::MAP{$self->path}; 2312 delete $cf::MAP{$self->path};
2019 2313
2020 $self->unlink_save; 2314 $self->unlink_save;
2021 2315
2022 bless $self, "cf::map"; 2316 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2317 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2318 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2319 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2321
2028 $cf::MAP{$self->path} = $self; 2322 $cf::MAP{$self->path} = $self;
2323 }
2029 2324
2030 $self->reset; # polite request, might not happen 2325 $self->reset; # polite request, might not happen
2031} 2326}
2032 2327
2033=item $maps = cf::map::tmp_maps 2328=item $maps = cf::map::tmp_maps
2082 : () 2377 : ()
2083 } @{ aio_readdir $UNIQUEDIR or [] } 2378 } @{ aio_readdir $UNIQUEDIR or [] }
2084 ] 2379 ]
2085} 2380}
2086 2381
2087package cf;
2088
2089=back 2382=back
2090 2383
2091=head3 cf::object 2384=head3 cf::object
2092 2385
2093=cut 2386=cut
2107 map { $_, inv_recursive_ $_->inv } @_ 2400 map { $_, inv_recursive_ $_->inv } @_
2108} 2401}
2109 2402
2110sub inv_recursive { 2403sub inv_recursive {
2111 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 }
2112} 2433}
2113 2434
2114package cf; 2435package cf;
2115 2436
2116=back 2437=back
2140 2461
2141 } else { 2462 } else {
2142 my $pl = $self->contr; 2463 my $pl = $self->contr;
2143 2464
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2465 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2466 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2468
2153 } else { 2469 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2470 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2471 $self->message ($msg, $flags);
2156 } 2472 }
2157 } 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 (@_);
2158} 2484}
2159 2485
2160=item $player_object->may ("access") 2486=item $player_object->may ("access")
2161 2487
2162Returns wether the given player is authorized to access resource "access" 2488Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2567 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2568 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2569 if $x <=0 && $y <= 0;
2244 2570
2245 $map->load; 2571 $map->load;
2246 $map->load_diag; 2572 $map->load_neighbours;
2247 2573
2248 return unless $self->contr->active; 2574 return unless $self->contr->active;
2249 $self->activate_recursive; 2575 $self->activate_recursive;
2250 2576
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2578 $self->enter_map ($map, $x, $y);
2253} 2579}
2254 2580
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2582
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2584her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2588
2262=cut 2589=cut
2263 2590
2264our $GOTOGEN; 2591our $GOTOGEN;
2265 2592
2266sub cf::object::player::goto { 2593sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2594 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2595
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2598
2272 $self->enter_link; 2599 $self->enter_link;
2273 2600
2274 (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
2275 my $map = eval { 2623 my $map = eval {
2276 my $map = cf::map::find $path; 2624 my $map = defined $path ? cf::map::find $path : undef;
2277 2625
2278 if ($map) { 2626 if ($map) {
2279 $map = $map->customise_for ($self); 2627 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2628 $map = $check->($map) if $check && $map;
2281 } else { 2629 } else {
2282 $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);
2283 } 2631 }
2284 2632
2285 $map 2633 $map
2286 }; 2634 };
2287 2635
2292 2640
2293 if ($gen == $self->{_goto_generation}) { 2641 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2642 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2643 $self->leave_link ($map, $x, $y);
2296 } 2644 }
2645
2646 $done->() if $done;
2297 })->prio (1); 2647 })->prio (1);
2298} 2648}
2299 2649
2300=item $player_object->enter_exit ($exit_object) 2650=item $player_object->enter_exit ($exit_object)
2301 2651
2338 $rmp->{origin_y} = $exit->y; 2688 $rmp->{origin_y} = $exit->y;
2339 } 2689 }
2340 2690
2341 $rmp->{random_seed} ||= $exit->random_seed; 2691 $rmp->{random_seed} ||= $exit->random_seed;
2342 2692
2343 my $data = cf::to_json $rmp; 2693 my $data = cf::encode_json $rmp;
2344 my $md5 = Digest::MD5::md5_hex $data; 2694 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2695 my $meta = "$RANDOMDIR/$md5.meta";
2346 2696
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2698 aio_write $fh, 0, (length $data), $data, 0;
2375 # if exit is damned, update players death & WoR home-position 2725 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp) 2726 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED); 2727 if $exit->flag (FLAG_DAMNED);
2378 2728
2379 (async { 2729 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2731
2380 $self->deactivate_recursive; # just to be sure 2732 $self->deactivate_recursive; # just to be sure
2381 unless (eval { 2733 unless (eval {
2382 $self->goto ($slaying, $hp, $sp); 2734 $self->goto ($slaying, $hp, $sp);
2383 2735
2384 1; 2736 1;
2410 2762
2411 utf8::encode $text; 2763 utf8::encode $text;
2412 $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);
2413} 2765}
2414 2766
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2767=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2768
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2772the message unless the client supports the msg packet.
2421 2773
2422=cut 2774=cut
2423 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
2424sub cf::client::send_msg { 2828sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2830
2427 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2430 2856
2431 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
2432 $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]));
2433 } else { 2864 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 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
2445 if (0 && $msg =~ /\[/) { 2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2883 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2885 $self->send_packet ("drawinfo $color $msg")
2450 } 2886 }
2451 } 2887 }
2452 } 2888 }
2453} 2889}
2454 2890
2455=item $client->ext_event ($type, %msg) 2891=item $client->ext_msg ($type, @msg)
2456 2892
2457Sends an ext event to the client. 2893Sends an ext event to the client.
2458 2894
2459=cut 2895=cut
2460 2896
2461sub cf::client::ext_event($$%) { 2897sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2898 my ($self, $type, @msg) = @_;
2463 2899
2900 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2903 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 2924}
2467 2925
2468=item $success = $client->query ($flags, "text", \&cb) 2926=item $success = $client->query ($flags, "text", \&cb)
2469 2927
2470Queues a query to the client, calling the given callback with 2928Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 2983 my ($ns, $buf) = @_;
2526 2984
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2985 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2986
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2995 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2996 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2997 }
2998
2999 $ns->ext_reply ($reply, @reply)
3000 if $reply;
3001
2536 } else { 3002 } else {
2537 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";
2538 } 3004 }
2539 3005
2540 cf::override; 3006 cf::override;
2587our $safe = new Safe "safe"; 3053our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3054our $safe_hole = new Safe::Hole;
2589 3055
2590$SIG{FPE} = 'IGNORE'; 3056$SIG{FPE} = 'IGNORE';
2591 3057
2592$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));
2593 3063
2594# here we export the classes and methods available to script code 3064# here we export the classes and methods available to script code
2595 3065
2596=pod 3066=pod
2597 3067
2598The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2599 3069
2600 cf::object 3070 cf::object
2601 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
2602 insert remove 3072 insert remove name archname title slaying race decrease_ob_nr
2603 3073
2604 cf::object::player 3074 cf::object::player
2605 player 3075 player
2606 3076
2607 cf::player 3077 cf::player
2612 3082
2613=cut 3083=cut
2614 3084
2615for ( 3085for (
2616 ["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
2617 insert remove)], 3088 decrease_ob_nr destroy)],
2618 ["cf::object::player" => qw(player)], 3089 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3090 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 3091 ["cf::map" => qw(trigger)],
2621) { 3092) {
2622 no strict 'refs'; 3093 no strict 'refs';
2698# the server's init and main functions 3169# the server's init and main functions
2699 3170
2700sub load_facedata($) { 3171sub load_facedata($) {
2701 my ($path) = @_; 3172 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 3180 warn "loading facedata from $path\n";
2704 3181
2705 my $facedata; 3182 my $facedata;
2706 0 < aio_load $path, $facedata 3183 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3184 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3186 $facedata = Coro::Storable::thaw $facedata;
2710 3187
2711 $facedata->{version} == 2 3188 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3189 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 3198 {
2715 my $faces = $facedata->{faceinfo}; 3199 my $faces = $facedata->{faceinfo};
2716 3200
2717 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3202 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3204 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3208
3209 cf::cede_to_tick;
2723 } 3210 }
2724 3211
2725 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3213 next unless $info->{smooth};
3214
2727 my $idx = cf::face::find $face 3215 my $idx = cf::face::find $face
2728 or next; 3216 or next;
3217
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3218 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3221 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3222 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3223 }
2734 Coro::cede; 3224
3225 cf::cede_to_tick;
2735 } 3226 }
2736 } 3227 }
2737 3228
2738 { 3229 {
2739 my $anims = $facedata->{animinfo}; 3230 my $anims = $facedata->{animinfo};
2740 3231
2741 while (my ($anim, $info) = each %$anims) { 3232 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3233 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3234 cf::cede_to_tick;
2744 } 3235 }
2745 3236
2746 cf::anim::invalidate_all; # d'oh 3237 cf::anim::invalidate_all; # d'oh
2747 } 3238 }
2748 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
2749 1 3275 1
2750} 3276}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 3311 load_resource_file "$MAPDIR/regions"
2754 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 }
2755} 3318}
2756 3319
2757sub reload_facedata { 3320sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3321 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3322 or die "unable to load facedata\n";
2788 3351
2789sub init { 3352sub init {
2790 reload_resources; 3353 reload_resources;
2791} 3354}
2792 3355
2793sub cfg_load { 3356sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3357 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3358 or return;
2796 3359
2797 local $/; 3360 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3361 *CFG = YAML::Load <$fh>;
2799 3362
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2801 3364
2802 $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};
2803 $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};
2814sub main { 3377sub main {
2815 # we must not ever block the main coroutine 3378 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3379 local $Coro::idle = sub {
2817 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#
2818 (async { 3381 (async {
2819 Event::one_event; 3382 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3384 })->prio (Coro::PRIO_MAX);
2821 }; 3385 };
2822 3386
2823 cfg_load; 3387 reload_config;
2824 db_init; 3388 db_init;
2825 load_extensions; 3389 load_extensions;
2826 3390
2827 $TICK_WATCHER->start; 3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno;
2828 Event::loop; 3393 EV::loop;
2829} 3394}
2830 3395
2831############################################################################# 3396#############################################################################
2832# initialisation and cleanup 3397# initialisation and cleanup
2833 3398
2834# install some emergency cleanup handlers 3399# install some emergency cleanup handlers
2835BEGIN { 3400BEGIN {
3401 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3402 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3403 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3404 cf::cleanup "SIG$signal";
2844 },
2845 ); 3405 };
2846 } 3406 }
2847} 3407}
2848 3408
2849sub write_runtime { 3409sub write_runtime_sync {
2850 my $runtime = "$LOCALDIR/runtime"; 3410 my $runtime = "$LOCALDIR/runtime";
2851 3411
2852 # first touch the runtime file to show we are still running: 3412 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time. 3413 # the fsync below can take a very very long time.
2854 3414
2880 and return; 3440 and return;
2881 3441
2882 warn "runtime file written.\n"; 3442 warn "runtime file written.\n";
2883 3443
2884 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 };
2885} 3488}
2886 3489
2887sub emergency_save() { 3490sub emergency_save() {
2888 my $freeze_guard = cf::freeze_mainloop; 3491 my $freeze_guard = cf::freeze_mainloop;
2889 3492
2895 # and maps saved/destroyed asynchronously. 3498 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3499 warn "begin emergency player save\n";
2897 for my $login (keys %cf::PLAYER) { 3500 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3501 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3502 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3504 $pl->save;
2901 } 3505 }
2902 warn "end emergency player save\n"; 3506 warn "end emergency player save\n";
2903 3507
2904 warn "begin emergency map save\n"; 3508 warn "begin emergency map save\n";
2910 warn "end emergency map save\n"; 3514 warn "end emergency map save\n";
2911 3515
2912 warn "begin emergency database checkpoint\n"; 3516 warn "begin emergency database checkpoint\n";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3517 BDB::db_env_txn_checkpoint $DB_ENV;
2914 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";
2915 }; 3523 };
2916 3524
2917 warn "leave emergency perl save\n"; 3525 warn "leave emergency perl save\n";
2918} 3526}
2919 3527
2934 warn "reloading..."; 3542 warn "reloading...";
2935 3543
2936 warn "entering sync_job"; 3544 warn "entering sync_job";
2937 3545
2938 cf::sync_job { 3546 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark 3547 cf::write_runtime_sync; # external watchdog should not bark
2940 cf::emergency_save; 3548 cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark 3549 cf::write_runtime_sync; # external watchdog should not bark
2942 3550
2943 warn "syncing database to disk"; 3551 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3552 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3553
2946 # 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
2947
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952 3555
2953 warn "flushing outstanding aio requests"; 3556 warn "flushing outstanding aio requests";
2954 for (;;) { 3557 for (;;) {
2955 BDB::flush; 3558 BDB::flush;
2956 IO::AIO::flush; 3559 IO::AIO::flush;
2957 Coro::cede; 3560 Coro::cede_notself;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3561 last unless IO::AIO::nreqs || BDB::nreqs;
2959 warn "iterate..."; 3562 warn "iterate...";
2960 } 3563 }
2961 3564
2962 ++$RELOAD; 3565 ++$RELOAD;
3021 warn "reloading cf.pm"; 3624 warn "reloading cf.pm";
3022 require cf; 3625 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3627
3025 warn "loading config and database again"; 3628 warn "loading config and database again";
3026 cf::cfg_load; 3629 cf::reload_config;
3027 3630
3028 warn "loading extensions"; 3631 warn "loading extensions";
3029 cf::load_extensions; 3632 cf::load_extensions;
3030 3633
3031 warn "reattaching attachments to objects/players"; 3634 warn "reattaching attachments to objects/players";
3038 warn "leaving sync_job"; 3641 warn "leaving sync_job";
3039 3642
3040 1 3643 1
3041 } or do { 3644 } or do {
3042 warn $@; 3645 warn $@;
3043 warn "error while reloading, exiting."; 3646 cf::cleanup "error while reloading, exiting.";
3044 exit 1;
3045 }; 3647 };
3046 3648
3047 warn "reloaded"; 3649 warn "reloaded";
3048}; 3650};
3049 3651
3051 3653
3052sub reload_perl() { 3654sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3655 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3656 # coro crashes during coro_state_free->destroy here.
3055 3657
3056 $RELOAD_WATCHER ||= Event->timer ( 3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3057 reentrant => 0,
3058 after => 0,
3059 data => WF_AUTOCANCEL,
3060 cb => sub {
3061 do_reload_perl; 3659 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3660 undef $RELOAD_WATCHER;
3063 },
3064 ); 3661 };
3065} 3662}
3066 3663
3067register_command "reload" => sub { 3664register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3665 my ($who, $arg) = @_;
3069 3666
3070 if ($who->flag (FLAG_WIZ)) { 3667 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3668 $who->message ("reloading server.");
3669 async {
3670 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3671 reload_perl;
3672 };
3073 } 3673 }
3074}; 3674};
3075 3675
3076unshift @INC, $LIBDIR; 3676unshift @INC, $LIBDIR;
3077 3677
3079 3679
3080our @WAIT_FOR_TICK; 3680our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN; 3681our @WAIT_FOR_TICK_BEGIN;
3082 3682
3083sub wait_for_tick { 3683sub wait_for_tick {
3084 return unless $TICK_WATCHER->is_active; 3684 return if tick_inhibit;
3085 return if $Coro::current == $Coro::main; 3685 return if $Coro::current == $Coro::main;
3086 3686
3087 my $signal = new Coro::Signal; 3687 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal; 3688 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait; 3689 $signal->wait;
3090} 3690}
3091 3691
3092sub wait_for_tick_begin { 3692sub wait_for_tick_begin {
3093 return unless $TICK_WATCHER->is_active; 3693 return if tick_inhibit;
3094 return if $Coro::current == $Coro::main; 3694 return if $Coro::current == $Coro::main;
3095 3695
3096 my $signal = new Coro::Signal; 3696 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3697 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3698 $signal->wait;
3099} 3699}
3100 3700
3101 my $min = 1e6;#d# 3701sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3702 if ($Coro::current != $Coro::main) {
3111 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"
3112 unless ++$bug_warning > 10; 3704 unless ++$bug_warning > 10;
3113 return; 3705 return;
3114 } 3706 }
3115 3707
3116 $NOW = $tick_start = Event::time;
3117
3118 cf::server_tick; # one server iteration 3708 cf::server_tick; # one server iteration
3119 3709
3120 0 && sync_job {#d# 3710 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 for(1..10) { 3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3122 my $t = Event::time; 3712 Coro::async_pool {
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3713 $Coro::current->{desc} = "runtime saver";
3124 or die; 3714 write_runtime_sync
3125 3715 or warn "ERROR: unable to write runtime file: $!";
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3716 };
3717 }
3142 3718
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3720 $sig->send;
3159 } 3721 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3722 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3723 $sig->send;
3162 } 3724 }
3163 3725
3164 $NOW = Event::time; 3726 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3727 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3728
3175 _post_tick; 3729 if (0) {
3176 3730 if ($NEXT_TICK) {
3177 3731 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d#
3734 }
3178 }, 3735 }
3179); 3736}
3180 3737
3181{ 3738{
3182 BDB::max_poll_time $TICK * 0.1; 3739 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3740
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3741 BDB::min_parallel 8;
3192 3742 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 3743 $Coro::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3744
3208 unless ($DB_ENV) { 3745 unless ($DB_ENV) {
3209 $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);
3210 3751
3211 cf::sync_job { 3752 cf::sync_job {
3212 eval { 3753 eval {
3213 BDB::db_env_open 3754 BDB::db_env_open
3214 $DB_ENV, 3755 $DB_ENV,
3216 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
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3758 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3759 0666;
3219 3760
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3761 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3762 };
3225 3763
3226 cf::cleanup "db_env_open(db): $@" if $@; 3764 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3765 };
3228 } 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 };
3229} 3777}
3230 3778
3231{ 3779{
3780 # configure IO::AIO
3781
3232 IO::AIO::min_parallel 8; 3782 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3783 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 3784 $Coro::AIO::WATCHER->priority (1);
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3785}
3245 3786
3246my $_log_backtrace; 3787my $_log_backtrace;
3247 3788
3248sub _log_backtrace { 3789sub _log_backtrace {
3252 3793
3253 # limit the # of concurrent backtraces 3794 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3795 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3796 ++$_log_backtrace;
3256 async { 3797 async {
3798 $Coro::current->{desc} = "abt $msg";
3799
3257 my @bt = fork_call { 3800 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3801 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3802 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 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 |"
3261 or die "addr2line: $!"; 3804 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines