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.288 by root, Mon Jun 25 07:40:53 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
34 63
35# configure various modules to our taste 64# configure various modules to our taste
36# 65#
37$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::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
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 68
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
47 87
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 89
50our %COMMAND = (); 90our %COMMAND = ();
51our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
57our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
58 98
59our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
60our @EVENT; 100our @EVENT;
61 101
62our $CONFDIR = confdir; 102our $CONFDIR = confdir;
63our $DATADIR = datadir; 103our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
73 117
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 120our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
81 122
123our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 125our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 126our $DB_ENV;
84 127
85our %CFG; 128our %CFG;
86 129
87our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 131our $RUNTIME;
132our $NOW;
89 133
90our %PLAYER; # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 135our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
93 137
94# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 140
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
100 145
101binmode STDOUT; 146binmode STDOUT;
102binmode STDERR; 147binmode STDERR;
103 148
104# read virtual server time, if available 149# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
109} 154}
110 155
111mkdir $_ 156mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
157 202
158The raw value load value from the last tick. 203The raw value load value from the last tick.
159 204
160=item %cf::CFG 205=item %cf::CFG
161 206
162Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 208from wherever your confdir points to.
164 209
165=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
166 211
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 212These 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 213returns 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. 214per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 215
216=item @cf::INVOKE_RESULTS
217
218This array contains the results of the last C<invoke ()> call. When
219C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
220that call.
221
171=back 222=back
172 223
173=cut 224=cut
174 225
175BEGIN { 226BEGIN {
179 $msg .= "\n" 230 $msg .= "\n"
180 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
181 232
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 234
184 utf8::encode $msg;
185 LOG llevError, $msg; 235 LOG llevError, $msg;
186 }; 236 };
187} 237}
238
239$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "=="
241
242 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d#
245 }#d#
246
247 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate
250};
251
252$SIG{__DIE__} = sub { }; #d#?
188 253
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 264for my $pkg (qw(
200 cf::global cf::attachable 265 cf::global cf::attachable
201 cf::object cf::object::player 266 cf::object cf::object::player
202 cf::client cf::player 267 cf::client cf::player
203 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
204 cf::map cf::party cf::region 270 cf::party cf::region
205)) { 271)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 273}
209 274
210$Event::DIED = sub { 275$EV::DIED = sub {
211 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
212}; 277};
213 278
214############################################################################# 279#############################################################################
215 280
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 303 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 304 $d
240 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
241} 306}
242 307
243=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
244 309
245Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
246 311
247=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
248 313
249Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
250 315
251=cut 316=cut
252 317
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max 318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 319
255sub to_json ($) { $json_coder->encode ($_[0]) } 320sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 321sub decode_json($) { $json_coder->decode ($_[0]) }
257 322
258=item cf::lock_wait $string 323=item cf::lock_wait $string
259 324
260Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
261 326
264Wait until the given lock is available and then acquires it and returns 329Wait 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, 330a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 331for example when the coroutine gets canceled), the lock is automatically
267returned. 332returned.
268 333
334Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro.
336
269Lock names should begin with a unique identifier (for example, cf::map::find 337Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 338uses map_find and cf::map::load uses map_load).
271 339
272=item $locked = cf::lock_active $string 340=item $locked = cf::lock_active $string
273 341
274Return true if the lock is currently active, i.e. somebody has locked it. 342Return true if the lock is currently active, i.e. somebody has locked it.
275 343
276=cut 344=cut
277 345
278our %LOCK; 346our %LOCK;
347our %LOCKER;#d#
279 348
280sub lock_wait($) { 349sub lock_wait($) {
281 my ($key) = @_; 350 my ($key) = @_;
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
282 356
283 # wait for lock, if any 357 # wait for lock, if any
284 while ($LOCK{$key}) { 358 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 359 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 360 Coro::schedule;
292 366
293 # wait, to be sure we are not locked 367 # wait, to be sure we are not locked
294 lock_wait $key; 368 lock_wait $key;
295 369
296 $LOCK{$key} = []; 370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
297 372
298 Coro::guard { 373 Coro::guard {
374 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 375 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 376 $_->ready for @{ delete $LOCK{$key} };
301 } 377 }
302} 378}
303 379
306 382
307 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
308} 384}
309 385
310sub freeze_mainloop { 386sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
312 388
313 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
314 $TICK_WATCHER->start; 390}
391
392=item cf::periodic $interval, $cb
393
394Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer.
396
397=cut
398
399sub periodic($$) {
400 my ($interval, $cb) = @_;
401
402 my $start = rand List::Util::min 180, $interval;
403
404 EV::periodic $start, $interval, 0, $cb
405}
406
407=item cf::get_slot $time[, $priority[, $name]]
408
409Allocate $time seconds of blocking CPU time at priority C<$priority>:
410This call blocks and returns only when you have at least C<$time> seconds
411of cpu time till the next tick. The slot is only valid till the next cede.
412
413The optional C<$name> can be used to identify the job to run. It might be
414used for statistical purposes and should identify the same time-class.
415
416Useful for short background jobs.
417
418=cut
419
420our @SLOT_QUEUE;
421our $SLOT_QUEUE;
422
423$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager");
426
427 my $signal = new Coro::Signal;
428
429 while () {
430 next_job:
431 my $avail = cf::till_tick;
432 if ($avail > 0.01) {
433 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) {
435 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send;
437 Coro::cede;
438 goto next_job;
439 }
440 }
441 }
442
443 if (@SLOT_QUEUE) {
444 # we do not use wait_for_tick() as it returns immediately when tick is inactive
445 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait;
447 } else {
448 Coro::schedule;
449 }
315 }; 450 }
316 $TICK_WATCHER->stop; 451};
317 $guard 452
453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
456 my ($time, $pri, $name) = @_;
457
458 $time = $TICK * .6 if $time > $TICK * .6;
459 my $sig = new Coro::Signal;
460
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready;
464 $sig->wait;
318} 465}
319 466
320=item cf::async { BLOCK } 467=item cf::async { BLOCK }
321 468
322Currently the same as Coro::async_pool, meaning you cannot use 469Currently the same as Coro::async_pool, meaning you cannot use
327 474
328BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
329 476
330=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
331 478
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 480is 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 481partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 482acceptable.
336 483
337If it must be done, put the blocking parts into C<sync_job>. This will run 484If 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 485the given BLOCK in another coroutine while waiting for the result. The
343 490
344sub sync_job(&) { 491sub sync_job(&) {
345 my ($job) = @_; 492 my ($job) = @_;
346 493
347 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 495 my $time = EV::time;
349 496
350 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
352 499
353 # TODO: use suspend/resume instead 500 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 501
355 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
356 503
357 my $busy = 1; 504 my $busy = 1;
358 my @res; 505 my @res;
359 506
360 (async { 507 (async {
508 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 509 @res = eval { $job->() };
362 warn $@ if $@; 510 warn $@ if $@;
363 undef $busy; 511 undef $busy;
364 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
365 513
366 while ($busy) { 514 while ($busy) {
367 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
368 } 519 }
520 }
369 521
370 $time = Event::time - $time; 522 my $time = EV::time - $time;
371 523
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 524 $TICK_START += $time; # do not account sync jobs to server load
376 525
377 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
378 } else { 527 } else {
379 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
380 529
405=item fork_call { }, $args 554=item fork_call { }, $args
406 555
407Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
411 560
412=cut 561=cut
413 562
414sub fork_call(&@) { 563sub fork_call(&@) {
415 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
416 565
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 566 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 567 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 568 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 569
422 if (my $pid = fork) { 570 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 571 reset_signals;
435 local $SIG{__WARN__}; 572 &$cb
436 local $SIG{__DIE__}; 573 }, @args;
437 eval {
438 close $fh1;
439 574
440 my @res = eval { $cb->(@args) }; 575 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 576}
442 };
443 577
444 warn $@ if $@; 578=item $coin = coin_from_name $name
445 _exit 0; 579
446 } 580=cut
581
582our %coin_alias = (
583 "silver" => "silvercoin",
584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
447} 603}
448 604
449=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
450 606
451Returns a single value from the environment database. 607Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 609=item cf::db_put $family => $key => $value
454 610
455Stores the given C<$value> in the family. It can currently store binary 611Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 612data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 613
614=item $db = cf::db_table "name"
615
616Create and/or open a new database table. The string must not be "db" and must be unique
617within each server.
618
458=cut 619=cut
620
621sub db_table($) {
622 my ($name) = @_;
623 my $db = BDB::db_create $DB_ENV;
624
625 eval {
626 $db->set_flags (BDB::CHKSUM);
627
628 utf8::encode $name;
629 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
630 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
631 cf::cleanup "db_open(db): $!" if $!;
632 };
633 cf::cleanup "db_open(db): $@" if $@;
634
635 $db
636}
459 637
460our $DB; 638our $DB;
461 639
462sub db_init { 640sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 641 cf::sync_job {
467 eval { 642 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 643 };
477} 644}
478 645
479sub db_get($$) { 646sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 647 my $key = "$_[0]/$_[1]";
481 648
531 if (1) { 698 if (1) {
532 $md5 = 699 $md5 =
533 join "\x00", 700 join "\x00",
534 $processversion, 701 $processversion,
535 map { 702 map {
536 Coro::cede; 703 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 704 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 705 } 0.. $#$src;
539 706
540 707
541 my $dbmd5 = db_get cache => "$id/md5"; 708 my $dbmd5 = db_get cache => "$id/md5";
579 746
580############################################################################# 747#############################################################################
581 748
582=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
583 750
584Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
585attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
587 754
588In the following description, CLASS can be any of C<global>, C<object> 755In the following description, CLASS can be any of C<global>, C<object>
589C<player>, C<client> or C<map> (i.e. the attachable objects in 756C<player>, C<client> or C<map> (i.e. the attachable objects in
590Crossfire TRT). 757Deliantra).
591 758
592=over 4 759=over 4
593 760
594=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
595 762
639=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
640 807
641Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
643 810
644Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
645that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
646 813
647These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
648 815
649=over 4 816=over 4
847 "; 1014 ";
848 die if $@; 1015 die if $@;
849} 1016}
850 1017
851our $override; 1018our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1019our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 1020
854sub override { 1021sub override {
855 $override = 1; 1022 $override = 1;
856 @invoke_results = (); 1023 @INVOKE_RESULTS = (@_);
857} 1024}
858 1025
859sub do_invoke { 1026sub do_invoke {
860 my $event = shift; 1027 my $event = shift;
861 my $callbacks = shift; 1028 my $callbacks = shift;
862 1029
863 @invoke_results = (); 1030 @INVOKE_RESULTS = ();
864 1031
865 local $override; 1032 local $override;
866 1033
867 for (@$callbacks) { 1034 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1035 eval { &{$_->[1]} };
877 } 1044 }
878 1045
879 0 1046 0
880} 1047}
881 1048
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1050
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1052
886Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
887 1054
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1055This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 1056removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 1057results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1058
892=back 1059=back
893 1060
894=cut 1061=cut
895 1062
896############################################################################# 1063#############################################################################
897# object support 1064# object support
1065
1066sub _object_equal($$);
1067sub _object_equal($$) {
1068 my ($a, $b) = @_;
1069
1070 return 0 unless (ref $a) eq (ref $b);
1071
1072 if ("HASH" eq ref $a) {
1073 my @ka = keys %$a;
1074 my @kb = keys %$b;
1075
1076 return 0 if @ka != @kb;
1077
1078 for (0 .. $#ka) {
1079 return 0 unless $ka[$_] eq $kb[$_];
1080 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1081 }
1082
1083 } elsif ("ARRAY" eq ref $a) {
1084
1085 return 0 if @$a != @$b;
1086
1087 for (0 .. $#$a) {
1088 return 0 unless _object_equal $a->[$_], $b->[$_];
1089 }
1090
1091 } elsif ($a ne $b) {
1092 return 0;
1093 }
1094
1095 1
1096}
1097
1098our $SLOW_MERGES;#d#
1099sub _can_merge {
1100 my ($ob1, $ob2) = @_;
1101
1102 ++$SLOW_MERGES;#d#
1103
1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
1106}
898 1107
899sub reattach { 1108sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1110 my ($obj) = @_;
902 1111
1112 # no longer needed after getting rid of delete_package?
903 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
904 1114
905 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
906 1116
907 @$registry = (); 1117 @$registry = ();
908 1118
923cf::attachable->attach ( 1133cf::attachable->attach (
924 prio => -1000000, 1134 prio => -1000000,
925 on_instantiate => sub { 1135 on_instantiate => sub {
926 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
927 1137
928 $data = from_json $data; 1138 $data = decode_json $data;
929 1139
930 for (@$data) { 1140 for (@$data) {
931 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
932 1142
933 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1159sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1160 my ($filename, $rdata, $objs) = @_;
951 1161
952 sync_job { 1162 sync_job {
953 if (length $$rdata) { 1163 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
956 1167
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1172 aio_close $fh;
962 1173
963 if (@$objs) { 1174 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1180 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
971 } 1182 }
972 } else { 1183 } else {
973 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
974 } 1185 }
979 } 1190 }
980 } else { 1191 } else {
981 aio_unlink $filename; 1192 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1193 aio_unlink "$filename.pst";
983 } 1194 }
984 } 1195 };
985} 1196}
986 1197
987sub object_freezer_as_string { 1198sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1199 my ($rdata, $objs) = @_;
989 1200
1001 or return; 1212 or return;
1002 1213
1003 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1216 or return;
1217
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1218 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs};
1007 } 1220 }
1008 1221
1222 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1224 $decname, length $data, scalar @{$av || []};
1225
1011 return ($data, $av); 1226 ($data, $av)
1012} 1227}
1013 1228
1014=head2 COMMAND CALLBACKS 1229=head2 COMMAND CALLBACKS
1015 1230
1016=over 4 1231=over 4
1086 cf::override; 1301 cf::override;
1087 }, 1302 },
1088 on_extcmd => sub { 1303 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1304 my ($pl, $buf) = @_;
1090 1305
1091 my $msg = eval { from_json $buf }; 1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1307
1093 if (ref $msg) { 1308 if (ref $msg) {
1309 my ($type, $reply, @payload) =
1310 "ARRAY" eq ref $msg
1311 ? @$msg
1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1313
1314 my @reply;
1315
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1316 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1317 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1318 }
1319
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1099 } else { 1323 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1325 }
1102 1326
1103 cf::override; 1327 cf::override;
1130 1354
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1357
1134 $ext{source} = 1358 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1137 . $source 1361 . $source
1138 . "\n};\n1"; 1362 . "\n};\n1";
1139 1363
1140 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1158 1382
1159 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1384 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1386 }
1164 1387
1165 warn $msg; 1388 warn $msg;
1166 } 1389 }
1167 1390
1181 1404
1182=back 1405=back
1183 1406
1184=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1185 1408
1186Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1187 1410
1188=cut 1411=cut
1189 1412
1190package cf::player; 1413package cf::player;
1191 1414
1192use Coro::AIO; 1415use Coro::AIO;
1193 1416
1194=head3 cf::player 1417=head3 cf::player
1195 1418
1196=over 4 1419=over 4
1420
1421=item cf::player::num_playing
1422
1423Returns the official number of playing players, as per the Crossfire metaserver rules.
1424
1425=cut
1426
1427sub num_playing {
1428 scalar grep
1429 $_->ob->map
1430 && !$_->hidden
1431 && !$_->ob->flag (cf::FLAG_WIZ),
1432 cf::player::list
1433}
1197 1434
1198=item cf::player::find $login 1435=item cf::player::find $login
1199 1436
1200Returns the given player object, loading it if necessary (might block). 1437Returns the given player object, loading it if necessary (might block).
1201 1438
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1474 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1475 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1476 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1477 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1478
1242 my $pl = load_pl path $login 1479 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1480 or return;
1481
1482 my $pl = cf::player::load_pl $f
1483 or return;
1484
1485 local $cf::PLAYER_LOADING{$login} = $pl;
1486 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1245 } 1488 }
1246 } 1489 }
1247} 1490}
1248 1491
1257 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1258 1501
1259 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1261 1504
1505 cf::get_slot 0.01;
1506
1262 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1263 Coro::cede; 1508 cf::cede_to_tick;
1264} 1509}
1265 1510
1266sub new($) { 1511sub new($) {
1267 my ($login) = @_; 1512 my ($login) = @_;
1268 1513
1274 $cf::PLAYER{$login} = $self; 1519 $cf::PLAYER{$login} = $self;
1275 1520
1276 $self 1521 $self
1277} 1522}
1278 1523
1524=item $player->send_msg ($channel, $msg, $color, [extra...])
1525
1526=cut
1527
1528sub send_msg {
1529 my $ns = shift->ns
1530 or return;
1531 $ns->send_msg (@_);
1532}
1533
1279=item $pl->quit_character 1534=item $pl->quit_character
1280 1535
1281Nukes the player without looking back. If logged in, the connection will 1536Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1537be destroyed. May block for a long time.
1283 1538
1287 my ($pl) = @_; 1542 my ($pl) = @_;
1288 1543
1289 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1290 1545
1291 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1292 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1293 1548
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1298 1555
1299 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1336 or return []; 1593 or return [];
1337 1594
1338 my @logins; 1595 my @logins;
1339 1596
1340 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1598 my $path = path $login;
1599
1600 # a .pst is a dead give-away for a valid player
1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1606 }
1344 1607
1345 utf8::decode $login; 1608 utf8::decode $login;
1346 push @logins, $login; 1609 push @logins, $login;
1347 } 1610 }
1348 1611
1375 } 1638 }
1376 1639
1377 \@paths 1640 \@paths
1378} 1641}
1379 1642
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1644
1382Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1383 1646
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1413=item $player->ext_reply ($msgid, %msg) 1647=item $player->ext_reply ($msgid, @msg)
1414 1648
1415Sends an ext reply to the player. 1649Sends an ext reply to the player.
1416 1650
1417=cut 1651=cut
1418 1652
1419sub ext_reply($$%) { 1653sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1654 my ($self, $id, @msg) = @_;
1421 1655
1422 $msg{msgid} = $id; 1656 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . cf::to_json \%msg);
1424} 1657}
1425 1658
1426=item $player->ext_event ($type, %msg) 1659=item $player->ext_msg ($type, @msg)
1427 1660
1428Sends an ext event to the client. 1661Sends an ext event to the client.
1429 1662
1430=cut 1663=cut
1431 1664
1432sub ext_event($$%) { 1665sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1666 my ($self, $type, @msg) = @_;
1434 1667
1435 $self->ns->ext_event ($type, %msg); 1668 $self->ns->ext_msg ($type, @msg);
1436} 1669}
1437 1670
1438=head3 cf::region 1671=head3 cf::region
1439 1672
1440=over 4 1673=over 4
1453 my ($path) = @_; 1686 my ($path) = @_;
1454 1687
1455 my ($match, $specificity); 1688 my ($match, $specificity);
1456 1689
1457 for my $region (list) { 1690 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1691 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1692 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1693 if $region->specificity > $specificity;
1461 } 1694 }
1462 } 1695 }
1463 1696
1484our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1485our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1486 1719
1487sub generate_random_map { 1720sub generate_random_map {
1488 my ($self, $rmp) = @_; 1721 my ($self, $rmp) = @_;
1722
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724
1489 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1490 $self->_create_random_map ( 1726 $self->_create_random_map (
1491 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1492 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1493 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1583 $self->init; # pass $1 etc. 1819 $self->init; # pass $1 etc.
1584 return $self; 1820 return $self;
1585 } 1821 }
1586 } 1822 }
1587 1823
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1824 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1825 ()
1590} 1826}
1591 1827
1592sub init { 1828sub init {
1593 my ($self) = @_; 1829 my ($self) = @_;
1615 1851
1616# the temporary/swap location 1852# the temporary/swap location
1617sub save_path { 1853sub save_path {
1618 my ($self) = @_; 1854 my ($self) = @_;
1619 1855
1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1621 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1622} 1858}
1623 1859
1624# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1625sub uniq_path { 1861sub uniq_path {
1626 my ($self) = @_; 1862 my ($self) = @_;
1627 1863
1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1629 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1630} 1866}
1631 1867
1632# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1633# all maps in C++... 1869# all maps in C++...
1656 1892
1657sub load_header_from($) { 1893sub load_header_from($) {
1658 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1659 1895
1660 utf8::encode $path; 1896 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 or return; 1898 or return;
1899
1900 $self->_load_header ($f)
1901 or return;
1902
1903 local $MAP_LOADING{$self->{path}} = $self;
1904 $f->resolve_delayed_derefs;
1666 1905
1667 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1668 1907
1669 1 1908 1
1670} 1909}
1724sub find { 1963sub find {
1725 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1726 1965
1727 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1728 1967
1968 cf::lock_wait "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1730 1970
1731 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1732 my $guard = cf::lock_acquire "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1733 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1734 or return; 1976 or return;
1735 1977
1736 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1737 1979
1739 or return; 1981 or return;
1740 1982
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1987 undef $guard1;
1744 $map->reset; 1988 $map->reset;
1745 undef $guard;
1746 return find $path; 1989 return find $path;
1747 } 1990 }
1748 1991
1749 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1750 } 1993 }
1759 local $self->{deny_reset} = 1; # loading can take a long time 2002 local $self->{deny_reset} = 1; # loading can take a long time
1760 2003
1761 my $path = $self->{path}; 2004 my $path = $self->{path};
1762 2005
1763 { 2006 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 2007 my $guard = cf::lock_acquire "map_data:$path";
1765 2008
2009 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 2010 return unless $self->in_memory == cf::MAP_SWAPPED;
1767 2011
1768 $self->in_memory (cf::MAP_LOADING); 2012 $self->in_memory (cf::MAP_LOADING);
1769 2013
1770 $self->alloc; 2014 $self->alloc;
1771 2015
1772 $self->pre_load; 2016 $self->pre_load;
1773 Coro::cede; 2017 cf::cede_to_tick;
1774 2018
2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2020 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 2021 $self->_load_objects ($f)
1776 or return; 2022 or return;
1777 2023
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1779 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1780 2026
1781 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2028 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2029 unless (aio_stat $uniq) {
2030 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2031 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2032 $self->_load_objects ($f);
2033 $f->resolve_delayed_derefs;
2034 }
1786 } 2035 }
1787 } 2036 }
1788 2037
1789 Coro::cede; 2038 $f->resolve_delayed_derefs;
2039
2040 cf::cede_to_tick;
1790 # now do the right thing for maps 2041 # now do the right thing for maps
1791 $self->link_multipart_objects; 2042 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2043 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2044 unless $self->difficulty;
1794 Coro::cede; 2045 cf::cede_to_tick;
1795 2046
1796 unless ($self->{deny_activate}) { 2047 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2048 $self->decay_objects;
1798 $self->fix_auto_apply; 2049 $self->fix_auto_apply;
1799 $self->update_buttons; 2050 $self->update_buttons;
1800 Coro::cede; 2051 cf::cede_to_tick;
1801 $self->set_darkness_map; 2052 $self->set_darkness_map;
1802 Coro::cede; 2053 cf::cede_to_tick;
1803 $self->activate; 2054 $self->activate;
1804 } 2055 }
1805 2056
2057 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME);
2059
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1807 } 2061 }
1808 2062
1809 $self->post_load; 2063 $self->post_load;
1810} 2064}
1811 2065
1820 2074
1821 $self 2075 $self
1822} 2076}
1823 2077
1824# find and load all maps in the 3x3 area around a map 2078# find and load all maps in the 3x3 area around a map
1825sub load_diag { 2079sub load_neighbours {
1826 my ($map) = @_; 2080 my ($map) = @_;
1827 2081
1828 my @diag; # diagonal neighbours 2082 my @neigh; # diagonal neighbours
1829 2083
1830 for (0 .. 3) { 2084 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 2085 my $neigh = $map->tile_path ($_)
1832 or next; 2086 or next;
1833 $neigh = find $neigh, $map 2087 $neigh = find $neigh, $map
1834 or next; 2088 or next;
1835 $neigh->load; 2089 $neigh->load;
1836 2090
2091 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2092 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2093 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 2094 }
1840 2095
1841 for (@diag) { 2096 for (grep defined $_->[0], @neigh) {
2097 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 2098 my $neigh = find $path, $origin
1843 or next; 2099 or next;
1844 $neigh->load; 2100 $neigh->load;
1845 } 2101 }
1846} 2102}
1847 2103
1852} 2108}
1853 2109
1854sub do_load_sync { 2110sub do_load_sync {
1855 my ($map) = @_; 2111 my ($map) = @_;
1856 2112
2113 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2114 if $Coro::current == $Coro::main;
2115
1857 cf::sync_job { $map->load }; 2116 cf::sync_job { $map->load };
1858} 2117}
1859 2118
1860our %MAP_PREFETCH; 2119our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2120our $MAP_PREFETCHER = undef;
1862 2121
1863sub find_async { 2122sub find_async {
1864 my ($path, $origin) = @_; 2123 my ($path, $origin, $load) = @_;
1865 2124
1866 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
1867 2126
1868 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1870 } 2129 }
1871 2130
1872 undef $MAP_PREFETCH{$path}; 2131 $MAP_PREFETCH{$path} |= $load;
2132
1873 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2134 $Coro::current->{desc} = "map prefetcher";
2135
1874 while (%MAP_PREFETCH) { 2136 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2137 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2138 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2139 $map->load if $v;
2140 }
1879 2141
1880 delete $MAP_PREFETCH{$path}; 2142 delete $MAP_PREFETCH{$k};
1881 } 2143 }
1882 } 2144 }
1883 undef $MAP_PREFETCHER; 2145 undef $MAP_PREFETCHER;
1884 }; 2146 };
1885 $MAP_PREFETCHER->prio (6); 2147 $MAP_PREFETCHER->prio (6);
1888} 2150}
1889 2151
1890sub save { 2152sub save {
1891 my ($self) = @_; 2153 my ($self) = @_;
1892 2154
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 2156
1895 $self->{last_save} = $cf::RUNTIME; 2157 $self->{last_save} = $cf::RUNTIME;
1896 2158
1897 return unless $self->dirty; 2159 return unless $self->dirty;
1898 2160
1904 return if $self->{deny_save}; 2166 return if $self->{deny_save};
1905 2167
1906 local $self->{last_access} = $self->last_access;#d# 2168 local $self->{last_access} = $self->last_access;#d#
1907 2169
1908 cf::async { 2170 cf::async {
2171 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
1910 }; 2173 };
2174
2175 cf::get_slot 0.02;
1911 2176
1912 if ($uniq) { 2177 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1914 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1915 } else { 2180 } else {
1921 my ($self) = @_; 2186 my ($self) = @_;
1922 2187
1923 # save first because save cedes 2188 # save first because save cedes
1924 $self->save; 2189 $self->save;
1925 2190
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2192
1928 return if $self->players; 2193 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
1930 return if $self->{deny_save}; 2195 return if $self->{deny_save};
1931 2196
2197 $self->in_memory (cf::MAP_SWAPPED);
2198
2199 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP;
1932 $self->clear; 2201 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2202}
1935 2203
1936sub reset_at { 2204sub reset_at {
1937 my ($self) = @_; 2205 my ($self) = @_;
1938 2206
1970 if $uniq; 2238 if $uniq;
1971 } 2239 }
1972 2240
1973 delete $cf::MAP{$self->path}; 2241 delete $cf::MAP{$self->path};
1974 2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2245 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2246
1979 $self->unlink_save; 2247 $self->unlink_save;
1980 $self->destroy; 2248 $self->destroy;
1981} 2249}
1982 2250
1983my $nuke_counter = "aaaa"; 2251my $nuke_counter = "aaaa";
1984 2252
1985sub nuke { 2253sub nuke {
1986 my ($self) = @_; 2254 my ($self) = @_;
1987 2255
2256 {
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
1988 delete $cf::MAP{$self->path}; 2259 delete $cf::MAP{$self->path};
1989 2260
1990 $self->unlink_save; 2261 $self->unlink_save;
1991 2262
1992 bless $self, "cf::map"; 2263 bless $self, "cf::map";
1993 delete $self->{deny_reset}; 2264 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2265 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2266 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2268
1998 $cf::MAP{$self->path} = $self; 2269 $cf::MAP{$self->path} = $self;
2270 }
1999 2271
2000 $self->reset; # polite request, might not happen 2272 $self->reset; # polite request, might not happen
2001} 2273}
2002 2274
2003=item $maps = cf::map::tmp_maps 2275=item $maps = cf::map::tmp_maps
2045 2317
2046sub unique_maps() { 2318sub unique_maps() {
2047 [ 2319 [
2048 map { 2320 map {
2049 utf8::decode $_; 2321 utf8::decode $_;
2050 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2051 ? normalise $_ 2325 : normalise $_
2052 : ()
2053 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2054 ] 2327 ]
2055} 2328}
2056 2329
2057package cf;
2058
2059=back 2330=back
2060 2331
2061=head3 cf::object 2332=head3 cf::object
2062 2333
2063=cut 2334=cut
2066 2337
2067=over 4 2338=over 4
2068 2339
2069=item $ob->inv_recursive 2340=item $ob->inv_recursive
2070 2341
2071Returns the inventory of the object _and_ their inventories, recursively. 2342Returns the inventory of the object I<and> their inventories, recursively,
2343but I<not> the object itself.
2072 2344
2073=cut 2345=cut
2074 2346
2075sub inv_recursive_; 2347sub inv_recursive_;
2076sub inv_recursive_ { 2348sub inv_recursive_ {
2079 2351
2080sub inv_recursive { 2352sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2082} 2354}
2083 2355
2356=item $ref = $ob->ref
2357
2358Creates and returns a persistent reference to an object that can be stored as a string.
2359
2360=item $ob = cf::object::deref ($refstring)
2361
2362returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2363even if the object actually exists. May block.
2364
2365=cut
2366
2367sub deref {
2368 my ($ref) = @_;
2369
2370 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2371 my ($uuid, $name) = ($1, $2);
2372 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2373 or return;
2374 $pl->ob->uuid eq $uuid
2375 or return;
2376
2377 $pl->ob
2378 } else {
2379 warn "$ref: cannot resolve object reference\n";
2380 undef
2381 }
2382}
2383
2084package cf; 2384package cf;
2085 2385
2086=back 2386=back
2087 2387
2088=head3 cf::object::player 2388=head3 cf::object::player
2094Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2394Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2095can be C<undef>. Does the right thing when the player is currently in a 2395can be C<undef>. Does the right thing when the player is currently in a
2096dialogue with the given NPC character. 2396dialogue with the given NPC character.
2097 2397
2098=cut 2398=cut
2399
2400our $SAY_CHANNEL = {
2401 id => "say",
2402 title => "Map",
2403 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2405};
2406
2407our $CHAT_CHANNEL = {
2408 id => "chat",
2409 title => "Chat",
2410 reply => "chat ",
2411 tooltip => "Player chat and shouts, global to the server.",
2412};
2099 2413
2100# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2101# with dialog boxes. 2415# with dialog boxes.
2102#TODO: the first argument must go, split into a $npc->reply_to ( method 2416#TODO: the first argument must go, split into a $npc->reply_to ( method
2103sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2110 2424
2111 } else { 2425 } else {
2112 my $pl = $self->contr; 2426 my $pl = $self->contr;
2113 2427
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2431
2123 } else { 2432 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2126 } 2435 }
2127 } 2436 }
2437}
2438
2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2440
2441=cut
2442
2443sub cf::object::send_msg {
2444 my $pl = shift->contr
2445 or return;
2446 $pl->send_msg (@_);
2128} 2447}
2129 2448
2130=item $player_object->may ("access") 2449=item $player_object->may ("access")
2131 2450
2132Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
2145 2464
2146=item $player_object->enter_link 2465=item $player_object->enter_link
2147 2466
2148Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2149 2468
2150The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2151I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2152 2473
2153Will never block. 2474Will never block.
2154 2475
2155=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2156 2477
2211 # use -1 or undef as default coordinates, not 0, 0 2532 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2533 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2534 if $x <=0 && $y <= 0;
2214 2535
2215 $map->load; 2536 $map->load;
2216 $map->load_diag; 2537 $map->load_neighbours;
2217 2538
2218 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2219 $self->activate_recursive; 2541 $self->activate_recursive;
2220 2542
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2223} 2545}
2224 2546
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2548
2227Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2552the new (success) or old (failed) map position. In either case, $done will
2553be called at the end of this process.
2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2231 2557
2232=cut 2558=cut
2233 2559
2234our $GOTOGEN; 2560our $GOTOGEN;
2235 2561
2236sub cf::object::player::goto { 2562sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2563 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2564
2239 # do generation counting so two concurrent goto's will be executed in-order 2565 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2567
2242 $self->enter_link; 2568 $self->enter_link;
2243 2569
2244 (async { 2570 (async {
2571 $Coro::current->{desc} = "player::goto $path $x $y";
2572
2573 # *tag paths override both path and x|y
2574 if ($path =~ /^\*(.*)$/) {
2575 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2576 my $ob = $obs[rand @obs];
2577
2578 # see if we actually can go there
2579 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2580 $ob = $obs[rand @obs];
2581 } else {
2582 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2583 }
2584 # else put us there anyways for now #d#
2585
2586 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2587 } else {
2588 ($path, $x, $y) = (undef, undef, undef);
2589 }
2590 }
2591
2245 my $map = eval { 2592 my $map = eval {
2246 my $map = cf::map::find $path; 2593 my $map = defined $path ? cf::map::find $path : undef;
2247 2594
2248 if ($map) { 2595 if ($map) {
2249 $map = $map->customise_for ($self); 2596 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2597 $map = $check->($map) if $check && $map;
2251 } else { 2598 } else {
2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2253 } 2600 }
2254 2601
2255 $map 2602 $map
2256 }; 2603 };
2257 2604
2262 2609
2263 if ($gen == $self->{_goto_generation}) { 2610 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2611 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2612 $self->leave_link ($map, $x, $y);
2266 } 2613 }
2614
2615 $done->() if $done;
2267 })->prio (1); 2616 })->prio (1);
2268} 2617}
2269 2618
2270=item $player_object->enter_exit ($exit_object) 2619=item $player_object->enter_exit ($exit_object)
2271 2620
2291} 2640}
2292 2641
2293sub prepare_random_map { 2642sub prepare_random_map {
2294 my ($exit) = @_; 2643 my ($exit) = @_;
2295 2644
2296 my $guard = cf::lock_acquire "exit_prepare:$exit";
2297
2298 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2299 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2300 # that depends on the exit object 2647 # that depends on the exit object
2301 2648
2302 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2304 if ($exit->map) { 2651 if ($exit->map) {
2305 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2306 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2307 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2308 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2309 } 2658 }
2310 2659
2311 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2312 2661
2313 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2314 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2316 2665
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2319 undef $fh; 2668 undef $fh;
2320 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2321 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2322 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2323 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2324 } 2677 }
2325} 2678}
2326 2679
2327sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2328 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2329 2682
2330 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2331 2684
2332 if ($exit->slaying eq "/!") {
2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
2336 cf::sync_job { prepare_random_map $exit };
2337 }
2338
2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2340 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp;
2342
2343 $self->enter_link; 2685 $self->enter_link;
2344 2686
2345 (async { 2687 (async {
2346 $self->deactivate_recursive; # just to be sure 2688 $Coro::current->{desc} = "enter_exit";
2689
2347 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2348 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2349 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2350 1; 2711 1
2351 }) { 2712 }) {
2352 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2353 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2354 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2355 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2356 2717
2357 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2376 2737
2377 utf8::encode $text; 2738 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2740}
2380 2741
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2742=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2743
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2744Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2745client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2387 2748
2388=cut 2749=cut
2389 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2807);
2808
2390sub cf::client::send_msg { 2809sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2811
2393 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2814
2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2816
2817 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel};
2820
2821 $self->ext_msg (channel_info => $channel)
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id};
2825
2826 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel)
2831 if $self->can_msg;
2832 }
2833
2834 $channel = $channel->{id};
2835 }
2836
2837 return unless @extra || length $msg;
2394 2838
2395 if ($self->can_msg) { 2839 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2840 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF;
2843
2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2397 } else { 2860 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) { 2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2409 if (0 && $msg =~ /\[/) { 2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2879 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2881 $self->send_packet ("drawinfo $color $msg")
2414 } 2882 }
2415 } 2883 }
2416 } 2884 }
2417} 2885}
2418 2886
2419=item $client->ext_event ($type, %msg) 2887=item $client->ext_msg ($type, @msg)
2420 2888
2421Sends an ext event to the client. 2889Sends an ext event to the client.
2422 2890
2423=cut 2891=cut
2424 2892
2425sub cf::client::ext_event($$%) { 2893sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2894 my ($self, $type, @msg) = @_;
2427 2895
2896 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2899 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg); 2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 }
2902}
2903
2904=item $client->ext_reply ($msgid, @msg)
2905
2906Sends an ext reply to the client.
2907
2908=cut
2909
2910sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_;
2912
2913 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 }
2430} 2920}
2431 2921
2432=item $success = $client->query ($flags, "text", \&cb) 2922=item $success = $client->query ($flags, "text", \&cb)
2433 2923
2434Queues a query to the client, calling the given callback with 2924Queues a query to the client, calling the given callback with
2457 2947
2458 1 2948 1
2459} 2949}
2460 2950
2461cf::client->attach ( 2951cf::client->attach (
2952 on_connect => sub {
2953 my ($ns) = @_;
2954
2955 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2956 },
2462 on_reply => sub { 2957 on_reply => sub {
2463 my ($ns, $msg) = @_; 2958 my ($ns, $msg) = @_;
2464 2959
2465 # this weird shuffling is so that direct followup queries 2960 # this weird shuffling is so that direct followup queries
2466 # get handled first 2961 # get handled first
2481 } 2976 }
2482 }, 2977 },
2483 on_exticmd => sub { 2978 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2979 my ($ns, $buf) = @_;
2485 2980
2486 my $msg = eval { from_json $buf }; 2981 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2982
2488 if (ref $msg) { 2983 if (ref $msg) {
2984 my ($type, $reply, @payload) =
2985 "ARRAY" eq ref $msg
2986 ? @$msg
2987 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2988
2989 my @reply;
2990
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2991 if (my $cb = $EXTICMD{$type}) {
2490 if (my %reply = $cb->($ns, $msg)) { 2992 @reply = $cb->($ns, @payload);
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 } 2993 }
2994
2995 $ns->ext_reply ($reply, @reply)
2996 if $reply;
2997
2495 } else { 2998 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2999 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 } 3000 }
2498 3001
2499 cf::override; 3002 cf::override;
2546our $safe = new Safe "safe"; 3049our $safe = new Safe "safe";
2547our $safe_hole = new Safe::Hole; 3050our $safe_hole = new Safe::Hole;
2548 3051
2549$SIG{FPE} = 'IGNORE'; 3052$SIG{FPE} = 'IGNORE';
2550 3053
2551$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3054$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math
3056 grepstart grepwhile mapstart mapwhile
3057 sort time
3058));
2552 3059
2553# here we export the classes and methods available to script code 3060# here we export the classes and methods available to script code
2554 3061
2555=pod 3062=pod
2556 3063
2557The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2558 3065
2559 cf::object contr pay_amount pay_player map 3066 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split
3069
2560 cf::object::player player 3070 cf::object::player
2561 cf::player peaceful 3071 player
2562 cf::map trigger 3072
3073 cf::player
3074 peaceful
3075
3076 cf::map
3077 trigger
2563 3078
2564=cut 3079=cut
2565 3080
2566for ( 3081for (
2567 ["cf::object" => qw(contr pay_amount pay_player map)], 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)],
2568 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2571) { 3088) {
2572 no strict 'refs'; 3089 no strict 'refs';
2648# the server's init and main functions 3165# the server's init and main functions
2649 3166
2650sub load_facedata($) { 3167sub load_facedata($) {
2651 my ($path) = @_; 3168 my ($path) = @_;
2652 3169
3170 # HACK to clear player env face cache, we need some signal framework
3171 # for this (global event?)
3172 %ext::player_env::MUSIC_FACE_CACHE = ();
3173
3174 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3175
2653 warn "loading facedata from $path\n"; 3176 warn "loading facedata from $path\n";
2654 3177
2655 my $facedata; 3178 my $facedata;
2656 0 < aio_load $path, $facedata 3179 0 < aio_load $path, $facedata
2657 or die "$path: $!"; 3180 or die "$path: $!";
2659 $facedata = Coro::Storable::thaw $facedata; 3182 $facedata = Coro::Storable::thaw $facedata;
2660 3183
2661 $facedata->{version} == 2 3184 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed."; 3185 or cf::cleanup "$path: version mismatch, cannot proceed.";
2663 3186
3187 # patch in the exptable
3188 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3191 };
3192 cf::cede_to_tick;
3193
2664 { 3194 {
2665 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
2666 3196
2667 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3200 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2672 Coro::cede; 3204
3205 cf::cede_to_tick;
2673 } 3206 }
2674 3207
2675 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
2677 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
2678 or next; 3212 or next;
3213
2679 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
3215 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 3217 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 3219 }
2684 Coro::cede; 3220
3221 cf::cede_to_tick;
2685 } 3222 }
2686 } 3223 }
2687 3224
2688 { 3225 {
2689 my $anims = $facedata->{animinfo}; 3226 my $anims = $facedata->{animinfo};
2690 3227
2691 while (my ($anim, $info) = each %$anims) { 3228 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3229 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 3230 cf::cede_to_tick;
2694 } 3231 }
2695 3232
2696 cf::anim::invalidate_all; # d'oh 3233 cf::anim::invalidate_all; # d'oh
2697 } 3234 }
2698 3235
3236 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource};
3240
3241 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245
3246 if ($info->{type} & 1) {
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type};
3261 } else {
3262 $RESOURCE{$name} = $info;
3263 }
3264
3265 cf::cede_to_tick;
3266 }
3267 }
3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3270
2699 1 3271 1
2700} 3272}
2701 3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3293
3294register_exticmd fx_want => sub {
3295 my ($ns, $want) = @_;
3296
3297 while (my ($k, $v) = each %$want) {
3298 $ns->fx_want ($k, $v);
3299 }
3300};
3301
3302sub load_resource_file($) {
3303 my $guard = lock_acquire "load_resource_file";
3304
3305 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100;
3307 cf::arch::commit_load;
3308
3309 $status
3310}
3311
2702sub reload_regions { 3312sub reload_regions {
3313 # HACK to clear player env face cache, we need some signal framework
3314 # for this (global event?)
3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3316
2703 load_resource_file "$MAPDIR/regions" 3317 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n"; 3318 or die "unable to load regions file\n";
3319
3320 for (cf::region::list) {
3321 $_->{match} = qr/$_->{match}/
3322 if exists $_->{match};
3323 }
2705} 3324}
2706 3325
2707sub reload_facedata { 3326sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 3327 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 3328 or die "unable to load facedata\n";
2720} 3339}
2721 3340
2722sub reload_resources { 3341sub reload_resources {
2723 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
2724 3343
3344 reload_facedata;
3345 reload_archetypes;
2725 reload_regions; 3346 reload_regions;
2726 reload_facedata;
2727 #reload_archetypes;#d#
2728 reload_archetypes;
2729 reload_treasures; 3347 reload_treasures;
2730 3348
2731 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
2732} 3350}
2733 3351
2734sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
2735 reload_resources; 3357 reload_resources;
2736} 3358}
2737 3359
2738sub cfg_load { 3360sub reload_config {
2739 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
2740 or return; 3362 or return;
2741 3363
2742 local $/; 3364 local $/;
2743 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
2744 3366
2745 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2746 3368
2747 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2748 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2754 }; 3376 };
2755 warn $@ if $@; 3377 warn $@ if $@;
2756 } 3378 }
2757} 3379}
2758 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
2759sub main { 3400sub main {
3401 atomic;
3402
2760 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
2761 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
2762 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2763 (async { 3406 (async {
2764 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
2765 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
2766 }; 3410 };
2767 3411
2768 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
2769 db_init; 3415 db_init;
2770 load_extensions; 3416 load_extensions;
2771 3417
2772 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
2773 Event::loop; 3426 EV::loop;
2774} 3427}
2775 3428
2776############################################################################# 3429#############################################################################
2777# initialisation and cleanup 3430# initialisation and cleanup
2778 3431
2779# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
2780BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
2781 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
2782 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2783 reentrant => 0,
2784 data => WF_AUTOCANCEL,
2785 signal => $signal,
2786 prio => 0,
2787 cb => sub {
2788 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
2789 },
2790 ); 3438 };
2791 } 3439 }
2792} 3440}
2793 3441
2794sub write_runtime { 3442sub write_runtime_sync {
2795 my $runtime = "$LOCALDIR/runtime";
2796
2797 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
2798 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
2799 3445
2800 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2801 3447
2802 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
2803 3449
2804 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2805 or return; 3451 or return;
2806 3452
2807 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
2808 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
2809 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
2819 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
2820 3466
2821 close $fh 3467 close $fh
2822 or return; 3468 or return;
2823 3469
2824 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2825 and return; 3471 and return;
2826 3472
2827 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
2828 3474
2829 1 3475 1
3476}
3477
3478our $uuid_lock;
3479our $uuid_skip;
3480
3481sub write_uuid_sync($) {
3482 $uuid_skip ||= $_[0];
3483
3484 return if $uuid_lock;
3485 local $uuid_lock = 1;
3486
3487 my $uuid = "$LOCALDIR/uuid";
3488
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return;
3491
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3493 $uuid_skip = 0;
3494
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return;
3497
3498 # always fsync - this file is important
3499 aio_fsync $fh
3500 and return;
3501
3502 close $fh
3503 or return;
3504
3505 aio_rename "$uuid~", $uuid
3506 and return;
3507
3508 warn "uuid file written ($value).\n";
3509
3510 1
3511
3512}
3513
3514sub write_uuid($$) {
3515 my ($skip, $sync) = @_;
3516
3517 $sync ? write_uuid_sync $skip
3518 : async { write_uuid_sync $skip };
2830} 3519}
2831 3520
2832sub emergency_save() { 3521sub emergency_save() {
2833 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
2834 3523
2840 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
2841 warn "begin emergency player save\n"; 3530 warn "begin emergency player save\n";
2842 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
2843 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
2844 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2845 $pl->save; 3535 $pl->save;
2846 } 3536 }
2847 warn "end emergency player save\n"; 3537 warn "end emergency player save\n";
2848 3538
2849 warn "begin emergency map save\n"; 3539 warn "begin emergency map save\n";
2855 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
2856 3546
2857 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
2858 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
2859 warn "end emergency database checkpoint\n"; 3549 warn "end emergency database checkpoint\n";
3550
3551 warn "begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "end write uuid\n";
2860 }; 3554 };
2861 3555
2862 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
2863} 3557}
2864 3558
2865sub post_cleanup { 3559sub post_cleanup {
2866 my ($make_core) = @_; 3560 my ($make_core) = @_;
2867 3561
2868 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
2869 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
2870} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
2871 3596
2872sub do_reload_perl() { 3597sub do_reload_perl() {
2873 # can/must only be called in main 3598 # can/must only be called in main
2874 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
2875 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
2876 return; 3601 return;
2877 } 3602 }
2878 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
2879 warn "reloading..."; 3607 warn "reloading...";
2880 3608
2881 warn "entering sync_job"; 3609 warn "entering sync_job";
2882 3610
2883 cf::sync_job { 3611 cf::sync_job {
2884 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
2885 cf::emergency_save; 3613 cf::emergency_save;
2886 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
2887 3615
2888 warn "syncing database to disk"; 3616 warn "syncing database to disk";
2889 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
2890 3618
2891 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
2892 3620
2893 warn "cancelling all WF_AUTOCANCEL watchers";
2894 for (Event::all_watchers) {
2895 $_->cancel if $_->data & WF_AUTOCANCEL;
2896 }
2897
2898 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
2899 for (;;) {
2900 BDB::flush;
2901 IO::AIO::flush;
2902 Coro::cede;
2903 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
2904 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2905 }
2906
2907 ++$RELOAD;
2908
2909 warn "cancelling all extension coros";
2910 $_->cancel for values %EXT_CORO;
2911 %EXT_CORO = ();
2912
2913 warn "removing commands";
2914 %COMMAND = ();
2915
2916 warn "removing ext/exti commands";
2917 %EXTCMD = ();
2918 %EXTICMD = ();
2919
2920 warn "unloading/nuking all extensions";
2921 for my $pkg (@EXTS) {
2922 warn "... unloading $pkg";
2923
2924 if (my $cb = $pkg->can ("unload")) {
2925 eval {
2926 $cb->($pkg);
2927 1
2928 } or warn "$pkg unloaded, but with errors: $@";
2929 } 3624 }
2930 3625
2931 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
2932 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
2933 } 3628 %EXT_CORO = ();
2934 3629
2935 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
2936 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
2937 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2938 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
2939 warn "... unloading $k"; 3639 warn "... unloading $pkg";
2940 delete $INC{$k};
2941 3640
2942 $k =~ s/\.pm$//;
2943 $k =~ s/\//::/g;
2944
2945 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
2946 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
2947 } 3650 }
2948 3651
2949 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
2950 } 3667 }
2951 3668
2952 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
2953 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
2954 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2955 3672
2956 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
2957 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
2958 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
2959 3676
2960 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
2961 # and global variables created in xs 3678 # and global variables created in xs
2962 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
2963 3680
2964 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
2965 3682
2966 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
2967 require cf; 3684 require cf;
2968 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2969 3686
2970 warn "loading config and database again"; 3687 warn "loading config and database again";
2971 cf::cfg_load; 3688 cf::reload_config;
2972 3689
2973 warn "loading extensions"; 3690 warn "loading extensions";
2974 cf::load_extensions; 3691 cf::load_extensions;
2975 3692
2976 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
2977 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
2978 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
2979 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
2980 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
2981 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
2982 3699
2983 warn "leaving sync_job"; 3700 warn "leaving sync_job";
2984 3701
2985 1 3702 1
2986 } or do { 3703 } or do {
2987 warn $@; 3704 warn $@;
2988 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
2989 exit 1;
2990 }; 3706 };
2991 3707
2992 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
2993}; 3711};
2994 3712
2995our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
2996 3714
2997sub reload_perl() { 3715sub reload_perl() {
2998 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
2999 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
3000 3718
3001 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3002 reentrant => 0,
3003 after => 0,
3004 data => WF_AUTOCANCEL,
3005 cb => sub {
3006 do_reload_perl; 3720 do_reload_perl;
3007 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
3008 },
3009 ); 3722 };
3010} 3723}
3011 3724
3012register_command "reload" => sub { 3725register_command "reload" => sub {
3013 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
3014 3727
3015 if ($who->flag (FLAG_WIZ)) { 3728 if ($who->flag (FLAG_WIZ)) {
3016 $who->message ("reloading server."); 3729 $who->message ("reloading server.");
3730 async {
3731 $Coro::current->{desc} = "perl_reload";
3017 async { reload_perl }; 3732 reload_perl;
3733 };
3018 } 3734 }
3019}; 3735};
3020 3736
3021unshift @INC, $LIBDIR; 3737unshift @INC, $LIBDIR;
3022 3738
3024 3740
3025our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3026our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3027 3743
3028sub wait_for_tick { 3744sub wait_for_tick {
3029 return unless $TICK_WATCHER->is_active;
3030 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3031 3746
3032 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3033 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3034 $signal->wait; 3749 $signal->wait;
3035} 3750}
3036 3751
3037sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3038 return unless $TICK_WATCHER->is_active;
3039 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3040 3754
3041 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3042 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3043 $signal->wait; 3757 $signal->wait;
3044} 3758}
3045 3759
3046 my $min = 1e6;#d# 3760sub tick {
3047 my $avg = 10;
3048$TICK_WATCHER = Event->timer (
3049 reentrant => 0,
3050 parked => 1,
3051 prio => 0,
3052 at => $NEXT_TICK || $TICK,
3053 data => WF_AUTOCANCEL,
3054 cb => sub {
3055 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3056 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3762 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3057 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3058 return; 3764 return;
3059 } 3765 }
3060 3766
3061 $NOW = $tick_start = Event::time;
3062
3063 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3064 3768
3065 0 && sync_job {#d# 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3066 for(1..10) { 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3067 my $t = Event::time; 3771 Coro::async_pool {
3068 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3772 $Coro::current->{desc} = "runtime saver";
3069 or die; 3773 write_runtime_sync
3070 3774 or warn "ERROR: unable to write runtime file: $!";
3071 $map->width (50);
3072 $map->height (50);
3073 $map->alloc;
3074 $map->_load_objects ("/tmp/x.map", 1);
3075 my $t = Event::time - $t;
3076
3077 #next unless $t < 0.0013;#d#
3078 if ($t < $min) {
3079 $min = $t;
3080 }
3081 $avg = $avg * 0.99 + $t * 0.01;
3082 }
3083 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3084 exit 0;
3085 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3086 }; 3775 };
3776 }
3087 3777
3088 $RUNTIME += $TICK;
3089 $NEXT_TICK += $TICK;
3090
3091 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3092 $NEXT_RUNTIME_WRITE = $NOW + 10;
3093 Coro::async_pool {
3094 write_runtime
3095 or warn "ERROR: unable to write runtime file: $!";
3096 };
3097 }
3098
3099# my $AFTER = Event::time;
3100# warn $AFTER - $NOW;#d#
3101
3102 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3103 $sig->send; 3779 $sig->send;
3104 } 3780 }
3105 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3106 $sig->send; 3782 $sig->send;
3107 } 3783 }
3108 3784
3109 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3110
3111 # if we are delayed by four ticks or more, skip them all
3112 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3113
3114 $TICK_WATCHER->at ($NEXT_TICK);
3115 $TICK_WATCHER->start;
3116
3117 $LOAD = ($NOW - $tick_start) / $TICK;
3118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3119 3787
3120 _post_tick; 3788 if (0) {
3121 3789 if ($NEXT_TICK) {
3122 3790 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d#
3793 }
3123 }, 3794 }
3124); 3795}
3125 3796
3126{ 3797{
3127 BDB::max_poll_time $TICK * 0.1; 3798 # configure BDB
3128 $BDB_POLL_WATCHER = Event->io ( 3799
3129 reentrant => 0,
3130 fd => BDB::poll_fileno,
3131 poll => 'r',
3132 prio => 0,
3133 data => WF_AUTOCANCEL,
3134 cb => \&BDB::poll_cb,
3135 );
3136 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3137 3801 BDB::max_poll_reqs $TICK * 0.1;
3138 BDB::set_sync_prepare { 3802 $AnyEvent::BDB::WATCHER->priority (1);
3139 my $status;
3140 my $current = $Coro::current;
3141 (
3142 sub {
3143 $status = $!;
3144 $current->ready; undef $current;
3145 },
3146 sub {
3147 Coro::schedule while defined $current;
3148 $! = $status;
3149 },
3150 )
3151 };
3152 3803
3153 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3154 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3155 3811
3156 cf::sync_job { 3812 cf::sync_job {
3157 eval { 3813 eval {
3158 BDB::db_env_open 3814 BDB::db_env_open
3159 $DB_ENV, 3815 $DB_ENV,
3161 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3817 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3162 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3818 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3163 0666; 3819 0666;
3164 3820
3165 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3821 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3166
3167 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3168 $DB_ENV->set_lk_detect;
3169 }; 3822 };
3170 3823
3171 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3172 }; 3825 };
3173 } 3826 }
3827
3828 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3829 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3830 };
3831 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3832 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3833 };
3834 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3835 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3836 };
3174} 3837}
3175 3838
3176{ 3839{
3840 # configure IO::AIO
3841
3177 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3178
3179 undef $Coro::AIO::WATCHER;
3180 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3181 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3182 reentrant => 0,
3183 data => WF_AUTOCANCEL,
3184 fd => IO::AIO::poll_fileno,
3185 poll => 'r',
3186 prio => 6,
3187 cb => \&IO::AIO::poll_cb,
3188 );
3189} 3845}
3190 3846
3191my $_log_backtrace; 3847my $_log_backtrace;
3192 3848
3193sub _log_backtrace { 3849sub _log_backtrace {
3196 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3197 3853
3198 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3199 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3200 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3201 async { 3858 async {
3859 $Coro::current->{desc} = "abt $msg";
3860
3202 my @bt = fork_call { 3861 my @bt = fork_call {
3203 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3204 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3863 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3205 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3864 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3206 or die "addr2line: $!"; 3865 or die "addr2line: $!";
3214 } 3873 }
3215 3874
3216 @funcs 3875 @funcs
3217 }; 3876 };
3218 3877
3219 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3220 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3221 --$_log_backtrace; 3881 --$_log_backtrace;
3222 }; 3882 };
3223 } else { 3883 } else {
3224 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines