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.448 by root, Fri Sep 19 05:30:23 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines