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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines