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.301 by root, Tue Jul 10 07:01:51 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines