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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines