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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41 75
42$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
43 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
74 118
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 121our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
82 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
85 130
86our %CFG; 131our %CFG;
87 132
88our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 134our $RUNTIME;
135our $NOW;
90 136
91our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
94 140
95# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 143
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
101 153
102binmode STDOUT; 154binmode STDOUT;
103binmode STDERR; 155binmode STDERR;
104 156
105# read virtual server time, if available 157# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
110} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
111 165
112mkdir $_ 166mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 168
115our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
116 170
117sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
118 187
119############################################################################# 188#############################################################################
120 189
121=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
122 191
158 227
159The raw value load value from the last tick. 228The raw value load value from the last tick.
160 229
161=item %cf::CFG 230=item %cf::CFG
162 231
163Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 233from wherever your confdir points to.
165 234
166=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
167 236
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
172=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
173 247
174This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call. 250that call.
177 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
178=back 258=back
179 259
180=cut 260=cut
181 261
182BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
183 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
184 my $msg = join "", @_; 269 my $msg = join "", @_;
185 270
186 $msg .= "\n" 271 $msg .= "\n"
187 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
188 273
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 275
191 utf8::encode $msg;
192 LOG llevError, $msg; 276 LOG llevWarn, $msg;
193 }; 277};
194} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
195 292
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 303for my $pkg (qw(
207 cf::global cf::attachable 304 cf::global cf::attachable
208 cf::object cf::object::player 305 cf::object cf::object::player
209 cf::client cf::player 306 cf::client cf::player
210 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
211 cf::map cf::party cf::region 309 cf::party cf::region
212)) { 310)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 312}
216 313
217$Event::DIED = sub { 314$EV::DIED = sub {
218 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
219}; 316};
220 317
221############################################################################# 318#############################################################################
222 319
223=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 343 $d
247 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
248} 345}
249 346
250=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
251 348
252Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
253 350
254=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
255 352
256Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
257 354
258=cut 355=cut
259 356
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 358
262sub to_json ($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
264 404
265=item cf::lock_wait $string 405=item cf::lock_wait $string
266 406
267Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
268 408
269=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
270 410
271Wait until the given lock is available and then acquires it and returns 411Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
274returned. 414returned.
275 415
416Locks are *not* recursive, locking from the same coro twice results in a
417deadlocked coro.
418
276Lock names should begin with a unique identifier (for example, cf::map::find 419Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 420uses map_find and cf::map::load uses map_load).
278 421
279=item $locked = cf::lock_active $string 422=item $locked = cf::lock_active $string
280 423
281Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
282 425
283=cut 426=cut
284 427
285our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
286 429
287sub lock_wait($) { 430sub lock_wait($) {
288 my ($key) = @_; 431 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 432}
296 433
297sub lock_acquire($) { 434sub lock_acquire($) {
298 my ($key) = @_; 435 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 436}
310 437
311sub lock_active($) { 438sub lock_active($) {
312 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 440}
316 441
317sub freeze_mainloop { 442sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 443 tick_inhibit_inc;
319 444
320 my $guard = Coro::guard { 445 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start;
322 };
323 $TICK_WATCHER->stop;
324 $guard
325} 446}
326 447
448=item cf::periodic $interval, $cb
449
450Like EV::periodic, but randomly selects a starting point so that the actions
451get spread over time.
452
453=cut
454
455sub periodic($$) {
456 my ($interval, $cb) = @_;
457
458 my $start = rand List::Util::min 180, $interval;
459
460 EV::periodic $start, $interval, 0, $cb
461}
462
327=item cf::get_slot $time[, $priority] 463=item cf::get_slot $time[, $priority[, $name]]
328 464
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 465Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 466This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 467of cpu time till the next tick. The slot is only valid till the next cede.
332 468
469The optional C<$name> can be used to identify the job to run. It might be
470used for statistical purposes and should identify the same time-class.
471
333Useful for short background jobs. 472Useful for short background jobs.
334 473
335=cut 474=cut
336 475
337our @SLOT_QUEUE; 476our @SLOT_QUEUE;
338our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
339 479
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
482 $Coro::current->desc ("timeslot manager");
483
342 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
343 486
344 while () { 487 while () {
345 next_job: 488 next_job:
489
346 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
347 if ($avail > 0.01) { 491
348 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
349 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
350 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
351 $job->[2]->send; 496 $job->[2]->send;
352 Coro::cede; 497 Coro::cede;
353 goto next_job; 498 goto next_job;
354 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
355 } 501 }
356 } 502 }
357 503
358 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 507 $signal->wait;
362 } else { 508 } else {
509 $busy = 0;
363 Coro::schedule; 510 Coro::schedule;
364 } 511 }
365 } 512 }
366}; 513};
367 514
368sub get_slot($;$) { 515sub get_slot($;$$) {
516 return if tick_inhibit || $Coro::current == $Coro::main;
517
369 my ($time, $pri) = @_; 518 my ($time, $pri, $name) = @_;
370 519
520 $time = clamp $time, 0.01, $TICK * .6;
521
522 my $sig = new Coro::Signal;
523
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
374 $sig->wait; 527 $sig->wait;
375} 528}
376 529
384 537
385BEGIN { *async = \&Coro::async_pool } 538BEGIN { *async = \&Coro::async_pool }
386 539
387=item cf::sync_job { BLOCK } 540=item cf::sync_job { BLOCK }
388 541
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 542The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 543is always able to handle events or runnable, as Deliantra is only
391partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 544partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
392acceptable. 545acceptable.
393 546
394If it must be done, put the blocking parts into C<sync_job>. This will run 547If it must be done, put the blocking parts into C<sync_job>. This will run
395the given BLOCK in another coroutine while waiting for the result. The 548the given BLOCK in another coroutine while waiting for the result. The
399=cut 552=cut
400 553
401sub sync_job(&) { 554sub sync_job(&) {
402 my ($job) = @_; 555 my ($job) = @_;
403 556
404 if ($Coro::current == $Coro::main) { 557 if (in_main) {
405 my $time = Event::time; 558 my $time = AE::time;
406 559
407 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
409 562
410 # TODO: use suspend/resume instead 563 #LOG llevError, Carp::longmess "sync job";#d#
411 # (but this is cancel-safe) 564
412 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
413 566
414 my $busy = 1; 567 my $busy = 1;
415 my @res; 568 my @res;
416 569
417 (async { 570 (async {
571 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 572 @res = eval { $job->() };
419 warn $@ if $@; 573 error $@ if $@;
420 undef $busy; 574 undef $busy;
421 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
422 576
423 while ($busy) { 577 while ($busy) {
424 Coro::cede or Event::one_event; 578 if (Coro::nready) {
579 Coro::cede_notself;
580 } else {
581 EV::loop EV::LOOP_ONESHOT;
425 } 582 }
583 }
426 584
427 $time = Event::time - $time; 585 my $time = AE::time - $time;
428 586
429 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431
432 $tick_start += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
433 588
434 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
435 } else { 590 } else {
436 # we are in another coroutine, how wonderful, everything just works 591 # we are in another coroutine, how wonderful, everything just works
437 592
457 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
458 613
459 $coro 614 $coro
460} 615}
461 616
462=item fork_call { }, $args 617=item fork_call { }, @args
463 618
464Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 622never block itself or use any form of event handling.
468 623
469=cut 624=cut
470 625
471sub _store_scalar { 626sub post_fork {
472 open my $fh, ">", \my $buf 627 reset_signals;
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478} 628}
479 629
480sub fork_call(&@) { 630sub fork_call(&@) {
481 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
482 632
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 633 # we seemingly have to make a local copy of the whole thing,
484# or die "socketpair: $!"; 634 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 635 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 636
488 if (my $pid = fork) { 637 my @res = Coro::Util::fork_eval {
489 close $fh2; 638 cf::post_fork;
639 &$cb
640 } @args;
490 641
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 642 wantarray ? @res : $res[-1]
492 warn "pst<$res>" unless $res =~ /^pst/; 643}
493 $res = Coro::Storable::thaw $res;
494 644
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 645sub objinfo {
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals;
502 local $SIG{__WARN__};
503 local $SIG{__DIE__};
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509
510 eval {
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 } 646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
654}
655
656=item $coin = coin_from_name $name
657
658=cut
659
660our %coin_alias = (
661 "silver" => "silvercoin",
662 "silvercoin" => "silvercoin",
663 "silvercoins" => "silvercoin",
664 "gold" => "goldcoin",
665 "goldcoin" => "goldcoin",
666 "goldcoins" => "goldcoin",
667 "platinum" => "platinacoin",
668 "platinumcoin" => "platinacoin",
669 "platinumcoins" => "platinacoin",
670 "platina" => "platinacoin",
671 "platinacoin" => "platinacoin",
672 "platinacoins" => "platinacoin",
673 "royalty" => "royalty",
674 "royalties" => "royalty",
675);
676
677sub coin_from_name($) {
678 $coin_alias{$_[0]}
679 ? cf::arch::find $coin_alias{$_[0]}
680 : undef
522} 681}
523 682
524=item $value = cf::db_get $family => $key 683=item $value = cf::db_get $family => $key
525 684
526Returns a single value from the environment database. 685Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 687=item cf::db_put $family => $key => $value
529 688
530Stores the given C<$value> in the family. It can currently store binary 689Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 690data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532 691
692=item $db = cf::db_table "name"
693
694Create and/or open a new database table. The string must not be "db" and must be unique
695within each server.
696
533=cut 697=cut
698
699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
703 my ($name) = @_;
704 my $db = BDB::db_create $DB_ENV;
705
706 eval {
707 $db->set_flags (BDB::CHKSUM);
708
709 utf8::encode $name;
710 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
711 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
712 cf::cleanup "db_open(db): $!" if $!;
713 };
714 cf::cleanup "db_open(db): $@" if $@;
715
716 $db
717}
534 718
535our $DB; 719our $DB;
536 720
537sub db_init { 721sub db_init {
538 unless ($DB) { 722 $DB ||= db_table "db";
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job {
542 eval {
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 }
552} 723}
553 724
554sub db_get($$) { 725sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
556 727
557 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
558 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
559 732
560 $! ? () 733 $! ? ()
561 : $data 734 : $data
562 }
563} 735}
564 736
565sub db_put($$$) { 737sub db_put($$$) {
566 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
567 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
606 if (1) { 778 if (1) {
607 $md5 = 779 $md5 =
608 join "\x00", 780 join "\x00",
609 $processversion, 781 $processversion,
610 map { 782 map {
611 Coro::cede; 783 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 784 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 785 } 0.. $#$src;
614 786
615 787
616 my $dbmd5 = db_get cache => "$id/md5"; 788 my $dbmd5 = db_get cache => "$id/md5";
623 795
624 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
625 my $data = $process->(\@data); 797 my $data = $process->(\@data);
626 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
627 799
628 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
629 801
630 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
631 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
632 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
633 805
643 815
644=cut 816=cut
645 817
646sub datalog($@) { 818sub datalog($@) {
647 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
648 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
649} 821}
650 822
651=back 823=back
652 824
653=cut 825=cut
654 826
655############################################################################# 827#############################################################################
656 828
657=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
658 830
659Many objects in crossfire are so-called attachable objects. That means you can 831Many objects in deliantra are so-called attachable objects. That means you can
660attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
662 834
663In the following description, CLASS can be any of C<global>, C<object> 835In the following description, CLASS can be any of C<global>, C<object>
664C<player>, C<client> or C<map> (i.e. the attachable objects in 836C<player>, C<client> or C<map> (i.e. the attachable objects in
665Crossfire TRT). 837Deliantra).
666 838
667=over 4 839=over 4
668 840
669=item $attachable->attach ($attachment, key => $value...) 841=item $attachable->attach ($attachment, key => $value...)
670 842
714=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
715 887
716Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
717given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
718 890
719Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
720that are attached at load/instantiate time, thus the need for a name. 892that are attached at load/instantiate time, thus the need for a name.
721 893
722These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
723 895
724=over 4 896=over 4
848 1020
849 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
850 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
851 1023
852 } elsif (ref $type) { 1024 } elsif (ref $type) {
853 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
854 1026
855 } else { 1027 } else {
856 shift @arg; 1028 shift @arg;
857 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
858 } 1030 }
859 } 1031 }
860} 1032}
861 1033
862sub _object_attach { 1034sub _object_attach {
872 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
873 } 1045 }
874 1046
875 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
876 } else { 1048 } else {
877 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
878 } 1050 }
879 1051
880 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
881} 1053}
882 1054
941 1113
942 for (@$callbacks) { 1114 for (@$callbacks) {
943 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
944 1116
945 if ($@) { 1117 if ($@) {
946 warn "$@";
947 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
948 override; 1119 override;
949 } 1120 }
950 1121
951 return 1 if $override; 1122 return 1 if $override;
952 } 1123 }
953 1124
954 0 1125 0
955} 1126}
956 1127
957=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1128=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
958 1129
959=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1130=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
960 1131
961Generate an object-specific event with the given arguments. 1132Generate an object-specific event with the given arguments.
962 1133
968 1139
969=cut 1140=cut
970 1141
971############################################################################# 1142#############################################################################
972# object support 1143# object support
973#
974 1144
1145sub _object_equal($$);
1146sub _object_equal($$) {
1147 my ($a, $b) = @_;
1148
1149 return 0 unless (ref $a) eq (ref $b);
1150
1151 if ("HASH" eq ref $a) {
1152 my @ka = keys %$a;
1153 my @kb = keys %$b;
1154
1155 return 0 if @ka != @kb;
1156
1157 for (0 .. $#ka) {
1158 return 0 unless $ka[$_] eq $kb[$_];
1159 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1160 }
1161
1162 } elsif ("ARRAY" eq ref $a) {
1163
1164 return 0 if @$a != @$b;
1165
1166 for (0 .. $#$a) {
1167 return 0 unless _object_equal $a->[$_], $b->[$_];
1168 }
1169
1170 } elsif ($a ne $b) {
1171 return 0;
1172 }
1173
1174 1
1175}
1176
1177our $SLOW_MERGES;#d#
975sub _can_merge { 1178sub _can_merge {
976 my ($ob1, $ob2) = @_; 1179 my ($ob1, $ob2) = @_;
977 1180
978 local $Storable::canonical = 1; 1181 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1182
982 $fob1 eq $fob2 1183 # we do the slow way here
1184 return _object_equal $ob1, $ob2
983} 1185}
984 1186
985sub reattach { 1187sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1189 my ($obj) = @_;
988 1190
1191 # no longer needed after getting rid of delete_package?
989 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1192 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
990 1193
991 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
992 1195
993 @$registry = (); 1196 @$registry = ();
994 1197
999 for (@$attach) { 1202 for (@$attach) {
1000 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1001 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1002 } 1205 }
1003 } else { 1206 } else {
1004 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1005 } 1208 }
1006 } 1209 }
1007} 1210}
1008 1211
1009cf::attachable->attach ( 1212cf::attachable->attach (
1010 prio => -1000000, 1213 prio => -1000000,
1011 on_instantiate => sub { 1214 on_instantiate => sub {
1012 my ($obj, $data) = @_; 1215 my ($obj, $data) = @_;
1013 1216
1014 $data = from_json $data; 1217 $data = decode_json $data;
1015 1218
1016 for (@$data) { 1219 for (@$data) {
1017 my ($name, $args) = @$_; 1220 my ($name, $args) = @$_;
1018 1221
1019 $obj->attach ($name, %{$args || {} }); 1222 $obj->attach ($name, %{$args || {} });
1035sub object_freezer_save { 1238sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1037 1240
1038 sync_job { 1241 sync_job {
1039 if (length $$rdata) { 1242 if (length $$rdata) {
1243 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1042 1247
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1249 aio_chmod $fh, SAVE_MODE;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1253 aio_fsync $fh;
1254 }
1047 close $fh; 1255 aio_close $fh;
1048 1256
1049 if (@$objs) { 1257 if (@$objs) {
1050 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1051 chmod SAVE_MODE, $fh; 1259 aio_chmod $fh, SAVE_MODE;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1264 aio_fsync $fh;
1265 }
1055 close $fh; 1266 aio_close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1268 }
1058 } else { 1269 } else {
1059 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1060 } 1271 }
1061 1272
1062 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
1063 } else { 1277 } else {
1064 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1065 } 1279 }
1066 } else { 1280 } else {
1067 aio_unlink $filename; 1281 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1069 } 1283 }
1070 } 1284 };
1071} 1285}
1072 1286
1073sub object_freezer_as_string { 1287sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1288 my ($rdata, $objs) = @_;
1075 1289
1087 or return; 1301 or return;
1088 1302
1089 unless (aio_stat "$filename.pst") { 1303 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1304 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1305 or return;
1306
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1307 my $st = eval { Coro::Storable::thaw $av };
1308 $av = $st->{objs};
1093 } 1309 }
1094 1310
1311 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1315
1097 return ($data, $av); 1316 ($data, $av)
1098} 1317}
1099 1318
1100=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1101 1320
1102=over 4 1321=over 4
1156 my ($name, $cb) = @_; 1375 my ($name, $cb) = @_;
1157 1376
1158 $EXTICMD{$name} = $cb; 1377 $EXTICMD{$name} = $cb;
1159} 1378}
1160 1379
1380use File::Glob ();
1381
1161cf::player->attach ( 1382cf::player->attach (
1162 on_command => sub { 1383 on_unknown_command => sub {
1163 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1164 1385
1165 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1166 or return; 1387 or return;
1167 1388
1175 my ($pl, $buf) = @_; 1396 my ($pl, $buf) = @_;
1176 1397
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1399
1179 if (ref $msg) { 1400 if (ref $msg) {
1401 my ($type, $reply, @payload) =
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405
1406 my @reply;
1407
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1408 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1409 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1410 }
1411
1412 $pl->ext_reply ($reply, @reply)
1413 if $reply;
1414
1185 } else { 1415 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1417 }
1188 1418
1189 cf::override; 1419 cf::override;
1190 }, 1420 },
1191); 1421);
1192 1422
1423# "readahead" all extensions
1424sub cache_extensions {
1425 my $grp = IO::AIO::aio_group;
1426
1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1428 for (grep /\.ext$/, @{$_[0]}) {
1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1430 }
1431 };
1432
1433 $grp
1434}
1435
1193sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1194 cf::sync_job { 1439 cf::sync_job {
1195 my %todo; 1440 my %todo;
1196 1441
1197 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1198 next unless -r $path; 1443 next unless -r $path;
1216 1461
1217 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1218 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1219 1464
1220 $ext{source} = 1465 $ext{source} =
1221 "package $pkg; use strict; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1222 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1223 . $source 1468 . $source
1224 . "\n};\n1"; 1469 . "\n};\n1";
1225 1470
1226 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1227 } 1472 }
1228 1473
1474 my $pass = 0;
1229 my %done; 1475 my %done;
1230 while (%todo) { 1476 while (%todo) {
1231 my $progress; 1477 my $progress;
1232 1478
1479 ++$pass;
1480
1481 ext:
1233 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1234 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1235 goto skip 1484 next ext
1236 unless exists $done{$_}; 1485 unless exists $done{$_};
1237 } 1486 }
1238 1487
1239 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1240 1489
1241 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1242 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1243 : "$v->{base}: extension inactive.\n";
1244 1494
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1245 if (exists $v->{meta}{mandatory}) { 1496 if exists $v->{meta}{mandatory};
1246 warn $msg; 1497
1247 warn "mandatory extension failed to load, exiting.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1248 exit 1; 1499 delete $todo{$k};
1249 } 1500 } else {
1250 1501 $done{$k} = delete $todo{$k};
1251 warn $msg; 1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1252 } 1507 }
1253
1254 $done{$k} = delete $todo{$k};
1255 push @EXTS, $v->{pkg};
1256 $progress = 1;
1257 } 1508 }
1258 1509
1259 skip: 1510 unless ($progress) {
1260 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1261 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1262 } 1518 }
1263 }; 1519 };
1264} 1520}
1265 1521
1266############################################################################# 1522#############################################################################
1267 1523
1268=back 1524=back
1269 1525
1270=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
1271 1527
1272Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
1273 1529
1274=cut 1530=cut
1275 1531
1276package cf::player; 1532package cf::player;
1277 1533
1278use Coro::AIO; 1534use Coro::AIO;
1279 1535
1280=head3 cf::player 1536=head3 cf::player
1281 1537
1282=over 4 1538=over 4
1539
1540=item cf::player::num_playing
1541
1542Returns the official number of playing players, as per the Crossfire metaserver rules.
1543
1544=cut
1545
1546sub num_playing {
1547 scalar grep
1548 $_->ob->map
1549 && !$_->hidden
1550 && !$_->ob->flag (cf::FLAG_WIZ),
1551 cf::player::list
1552}
1283 1553
1284=item cf::player::find $login 1554=item cf::player::find $login
1285 1555
1286Returns the given player object, loading it if necessary (might block). 1556Returns the given player object, loading it if necessary (might block).
1287 1557
1306 1576
1307sub exists($) { 1577sub exists($) {
1308 my ($login) = @_; 1578 my ($login) = @_;
1309 1579
1310 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1311 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1312} 1582}
1313 1583
1314sub find($) { 1584sub find($) {
1315 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1316 my $login = $_[0]; 1586 my $login = $_[0];
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1593 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1594 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1595 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1596 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1597
1328 my $pl = load_pl path $login 1598 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1599 or return;
1600
1601 my $pl = cf::player::load_pl $f
1602 or return;
1603
1604 local $cf::PLAYER_LOADING{$login} = $pl;
1605 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1331 } 1607 }
1332 } 1608 }
1333} 1609}
1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1334 1623
1335sub save($) { 1624sub save($) {
1336 my ($pl) = @_; 1625 my ($pl) = @_;
1337 1626
1338 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1343 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1344 1633
1345 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1347 1636
1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1641
1348 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1349 Coro::cede; 1643 cf::cede_to_tick;
1350} 1644}
1351 1645
1352sub new($) { 1646sub new($) {
1353 my ($login) = @_; 1647 my ($login) = @_;
1354 1648
1360 $cf::PLAYER{$login} = $self; 1654 $cf::PLAYER{$login} = $self;
1361 1655
1362 $self 1656 $self
1363} 1657}
1364 1658
1659=item $player->send_msg ($channel, $msg, $color, [extra...])
1660
1661=cut
1662
1663sub send_msg {
1664 my $ns = shift->ns
1665 or return;
1666 $ns->send_msg (@_);
1667}
1668
1365=item $pl->quit_character 1669=item $pl->quit_character
1366 1670
1367Nukes the player without looking back. If logged in, the connection will 1671Nukes the player without looking back. If logged in, the connection will
1368be destroyed. May block for a long time. 1672be destroyed. May block for a long time.
1369 1673
1373 my ($pl) = @_; 1677 my ($pl) = @_;
1374 1678
1375 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1376 1680
1377 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1378 $pl->password ("*"); # this should lock out the player until we nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1379 1683
1380 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1381 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1382 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1383 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1384 1692
1385 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1386 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1387 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1422 or return []; 1730 or return [];
1423 1731
1424 my @logins; 1732 my @logins;
1425 1733
1426 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1735 my $path = path $login;
1736
1737 # a .pst is a dead give-away for a valid player
1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1743 }
1430 1744
1431 utf8::decode $login; 1745 utf8::decode $login;
1432 push @logins, $login; 1746 push @logins, $login;
1433 } 1747 }
1434 1748
1435 \@logins 1749 \@logins
1436} 1750}
1437 1751
1438=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1439 1755
1440Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1441player. May block. 1757player. May block.
1442 1758
1443=cut 1759=cut
1461 } 1777 }
1462 1778
1463 \@paths 1779 \@paths
1464} 1780}
1465 1781
1466=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1467 1783
1468Expand crossfire pod fragments into protocol xml. 1784Expand deliantra pod fragments into protocol xml.
1469 1785
1470=cut
1471
1472sub expand_cfpod {
1473 ((my $self), (local $_)) = @_;
1474
1475 # escape & and <
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478
1479 # this is buggy, it needs to properly take care of nested <'s
1480
1481 1 while
1482 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/
1486 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1
1489 }ge
1490 # replace H<hint text>
1491 || s{H<([^\>]*)>}
1492 {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "")
1496 [$self->{hintmode}]
1497 }ge;
1498
1499 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g;
1501
1502 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines
1507
1508 $_
1509}
1510
1511sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode}
1514}
1515
1516=item $player->ext_reply ($msgid, %msg) 1786=item $player->ext_reply ($msgid, @msg)
1517 1787
1518Sends an ext reply to the player. 1788Sends an ext reply to the player.
1519 1789
1520=cut 1790=cut
1521 1791
1522sub ext_reply($$%) { 1792sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1793 my ($self, $id, @msg) = @_;
1524 1794
1525 $msg{msgid} = $id; 1795 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1796}
1528 1797
1529=item $player->ext_event ($type, %msg) 1798=item $player->ext_msg ($type, @msg)
1530 1799
1531Sends an ext event to the client. 1800Sends an ext event to the client.
1532 1801
1533=cut 1802=cut
1534 1803
1535sub ext_event($$%) { 1804sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1805 my ($self, $type, @msg) = @_;
1537 1806
1538 $self->ns->ext_event ($type, %msg); 1807 $self->ns->ext_msg ($type, @msg);
1539} 1808}
1540 1809
1541=head3 cf::region 1810=head3 cf::region
1542 1811
1543=over 4 1812=over 4
1552 1821
1553=cut 1822=cut
1554 1823
1555sub find_by_path($) { 1824sub find_by_path($) {
1556 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1557 1828
1558 my ($match, $specificity); 1829 my ($match, $specificity);
1559 1830
1560 for my $region (list) { 1831 for my $region (list) {
1561 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1587our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1588our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1589 1860
1590sub generate_random_map { 1861sub generate_random_map {
1591 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1592 # mit "rum" bekleckern, nicht 1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1593 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1594 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1595 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1596 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1597 $rmp->{exit_on_final_map},
1598 $rmp->{xsize}, $rmp->{ysize},
1599 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1600 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1601 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1602 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1603 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1604 (cf::region::find $rmp->{region}), $rmp->{custom}
1605 )
1606} 1867}
1607 1868
1608=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1609 1870
1610Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1615 1876
1616sub register { 1877sub register {
1617 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1618 my $pkg = caller; 1879 my $pkg = caller;
1619 1880
1620 no strict;
1621 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1622 1882
1623 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1624} 1884}
1625 1885
1626# also paths starting with '/' 1886# also paths starting with '/'
1627$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1628 1888
1629sub thawer_merge { 1889sub thawer_merge {
1630 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1631 1891
1632 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1637} 1897}
1638 1898
1639sub normalise { 1899sub normalise {
1640 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1641 1901
1642 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1643 1903
1644 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1645 1905
1646 # map plan: 1906 # map plan:
1647 # 1907 #
1662 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1663 $path = "$base/$path"; 1923 $path = "$base/$path";
1664 } 1924 }
1665 1925
1666 for ($path) { 1926 for ($path) {
1667 redo if s{//}{/};
1668 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1669 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1670 } 1929 }
1671 1930
1672 $path 1931 $path
1686 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1687 return $self; 1946 return $self;
1688 } 1947 }
1689 } 1948 }
1690 1949
1691 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1692 () 1951 ()
1693} 1952}
1694 1953
1695sub init { 1954sub init {
1696 my ($self) = @_; 1955 my ($self) = @_;
1718 1977
1719# the temporary/swap location 1978# the temporary/swap location
1720sub save_path { 1979sub save_path {
1721 my ($self) = @_; 1980 my ($self) = @_;
1722 1981
1723 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1982 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1724 "$TMPDIR/$path.map" 1983 "$TMPDIR/$path.map"
1725} 1984}
1726 1985
1727# the unique path, undef == no special unique path 1986# the unique path, undef == no special unique path
1728sub uniq_path { 1987sub uniq_path {
1729 my ($self) = @_; 1988 my ($self) = @_;
1730 1989
1731 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1732 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1733}
1734
1735# and all this just because we cannot iterate over
1736# all maps in C++...
1737sub change_all_map_light {
1738 my ($change) = @_;
1739
1740 $_->change_map_light ($change)
1741 for grep $_->outdoor, values %cf::MAP;
1742} 1992}
1743 1993
1744sub decay_objects { 1994sub decay_objects {
1745 my ($self) = @_; 1995 my ($self) = @_;
1746 1996
1759 2009
1760sub load_header_from($) { 2010sub load_header_from($) {
1761 my ($self, $path) = @_; 2011 my ($self, $path) = @_;
1762 2012
1763 utf8::encode $path; 2013 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 2014 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 2015 or return;
2016
2017 $self->_load_header ($f)
2018 or return;
2019
2020 local $MAP_LOADING{$self->{path}} = $self;
2021 $f->resolve_delayed_derefs;
1769 2022
1770 $self->{load_path} = $path; 2023 $self->{load_path} = $path;
1771 2024
1772 1 2025 1
1773} 2026}
1825 2078
1826sub find; 2079sub find;
1827sub find { 2080sub find {
1828 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1829 2082
2083 cf::cede_to_tick;
2084
1830 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1831 2086
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1833 2089
1834 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path";
1836 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1837 or return; 2092 or return;
1838 2093
1839 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1840 2095
1842 or return; 2097 or return;
1843 2098
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2099 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 2100 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 2101 #$cf::WAIT_FOR_TICK->wait;
2102 undef $guard2;
2103 undef $guard1;
1847 $map->reset; 2104 $map->reset;
1848 undef $guard;
1849 return find $path; 2105 return find $path;
1850 } 2106 }
1851 2107
1852 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1853 } 2109 }
1854} 2110}
1855 2111
1856sub pre_load { } 2112sub pre_load { }
1857sub post_load { } 2113#sub post_load { } # XS
1858 2114
1859sub load { 2115sub load {
1860 my ($self) = @_; 2116 my ($self) = @_;
1861 2117
1862 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
1863 2119
1864 my $path = $self->{path}; 2120 my $path = $self->{path};
1865 2121
1866 { 2122 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2123 my $guard = cf::lock_acquire "map_data:$path";
1868 2124
2125 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2126 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2127
1871 $self->in_memory (cf::MAP_LOADING); 2128 $self->in_memory (cf::MAP_LOADING);
1872 2129
1873 $self->alloc; 2130 $self->alloc;
1874 2131
1875 $self->pre_load; 2132 $self->pre_load;
1876 Coro::cede; 2133 cf::cede_to_tick;
1877 2134
2135 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2137 $self->_load_objects ($f)
1879 or return; 2138 or return;
1880 2139
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
1882 if delete $self->{load_original}; 2141 if delete $self->{load_original};
1883 2142
1884 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2144 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2145 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2147 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2148 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs;
2150 }
1889 } 2151 }
1890 } 2152 }
1891 2153
1892 Coro::cede; 2154 $f->resolve_delayed_derefs;
2155
2156 cf::cede_to_tick;
1893 # now do the right thing for maps 2157 # now do the right thing for maps
1894 $self->link_multipart_objects; 2158 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2159 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2160 unless $self->difficulty;
1897 Coro::cede; 2161 cf::cede_to_tick;
1898 2162
1899 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2164 $self->decay_objects;
1901 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
1902 $self->update_buttons; 2166 $self->update_buttons;
1903 Coro::cede; 2167 cf::cede_to_tick;
1904 $self->set_darkness_map;
1905 Coro::cede;
1906 $self->activate; 2168 $self->activate;
1907 } 2169 }
1908 2170
2171 $self->{last_save} = $cf::RUNTIME;
2172 $self->last_access ($cf::RUNTIME);
2173
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2174 $self->in_memory (cf::MAP_ACTIVE);
1910 } 2175 }
1911 2176
1912 $self->post_load; 2177 $self->post_load;
1913}
1914 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
1915sub customise_for { 2185sub customise_for {
1916 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
1917 2187
1918 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
1919 if $self->per_player; 2189 if $self->per_player;
1923 2193
1924 $self 2194 $self
1925} 2195}
1926 2196
1927# find and load all maps in the 3x3 area around a map 2197# find and load all maps in the 3x3 area around a map
1928sub load_diag { 2198sub load_neighbours {
1929 my ($map) = @_; 2199 my ($map) = @_;
1930 2200
1931 my @diag; # diagonal neighbours 2201 my @neigh; # diagonal neighbours
1932 2202
1933 for (0 .. 3) { 2203 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2204 my $neigh = $map->tile_path ($_)
1935 or next; 2205 or next;
1936 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
1937 or next; 2207 or next;
1938 $neigh->load; 2208 $neigh->load;
1939 2209
2210 # now find the diagonal neighbours
2211 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2214 }
1943 2215
1944 for (@diag) { 2216 for (grep defined $_->[0], @neigh) {
2217 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2218 my $neigh = find $path, $origin
1946 or next; 2219 or next;
1947 $neigh->load; 2220 $neigh->load;
1948 } 2221 }
1949} 2222}
1950 2223
1951sub find_sync { 2224sub find_sync {
1952 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
1953 2226
1954 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
1955} 2231}
1956 2232
1957sub do_load_sync { 2233sub do_load_sync {
1958 my ($map) = @_; 2234 my ($map) = @_;
1959 2235
1960 cf::sync_job { $map->load }; 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main;
2238
2239 $map->load;
1961} 2240}
1962 2241
1963our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
1965 2244
1966sub find_async { 2245sub find_async {
1967 my ($path, $origin) = @_; 2246 my ($path, $origin, $load) = @_;
1968 2247
1969 $path = normalise $path, $origin && $origin->{path}; 2248 $path = normalise $path, $origin && $origin->{path};
1970 2249
1971 if (my $map = $cf::MAP{$path}) { 2250 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2252 }
1974 2253
1975 undef $MAP_PREFETCH{$path}; 2254 $MAP_PREFETCH{$path} |= $load;
2255
1976 $MAP_PREFETCHER ||= cf::async { 2256 $MAP_PREFETCHER ||= cf::async {
2257 $Coro::current->{desc} = "map prefetcher";
2258
1977 while (%MAP_PREFETCH) { 2259 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2260 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2261 if (my $map = find $k) {
1980 $map->load; 2262 $map->load if $v;
1981 } 2263 }
1982 2264
1983 delete $MAP_PREFETCH{$path}; 2265 delete $MAP_PREFETCH{$k};
1984 } 2266 }
1985 } 2267 }
1986 undef $MAP_PREFETCHER; 2268 undef $MAP_PREFETCHER;
1987 }; 2269 };
1988 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
1989 2271
1990 () 2272 ()
1991} 2273}
1992 2274
2275# common code, used by both ->save and ->swapout
1993sub save { 2276sub _save {
1994 my ($self) = @_; 2277 my ($self) = @_;
1995
1996 my $lock = cf::lock_acquire "map_data:" . $self->path;
1997 2278
1998 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
1999 2280
2000 return unless $self->dirty; 2281 return unless $self->dirty;
2001 2282
2007 return if $self->{deny_save}; 2288 return if $self->{deny_save};
2008 2289
2009 local $self->{last_access} = $self->last_access;#d# 2290 local $self->{last_access} = $self->last_access;#d#
2010 2291
2011 cf::async { 2292 cf::async {
2293 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2294 $_->contr->save for $self->players;
2013 }; 2295 };
2296
2297 cf::get_slot 0.02;
2014 2298
2015 if ($uniq) { 2299 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2300 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2301 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2302 } else {
2019 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2020 } 2304 }
2021} 2305}
2022 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2023sub swap_out { 2315sub swap_out {
2024 my ($self) = @_; 2316 my ($self) = @_;
2025 2317
2026 # save first because save cedes
2027 $self->save;
2028
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2319
2320 return if $self->in_memory != cf::MAP_ACTIVE;
2321 return if $self->{deny_save};
2031 return if $self->players; 2322 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save};
2034 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2035 $self->clear; 2333 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2334}
2038 2335
2039sub reset_at { 2336sub reset_at {
2040 my ($self) = @_; 2337 my ($self) = @_;
2041 2338
2059 2356
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2358
2062 return if $self->players; 2359 return if $self->players;
2063 2360
2064 warn "resetting map ", $self->path; 2361 cf::trace "resetting map ", $self->path, "\n";
2065 2362
2066 $self->in_memory (cf::MAP_SWAPPED); 2363 $self->in_memory (cf::MAP_SWAPPED);
2067 2364
2068 # need to save uniques path 2365 # need to save uniques path
2069 unless ($self->{deny_save}) { 2366 unless ($self->{deny_save}) {
2073 if $uniq; 2370 if $uniq;
2074 } 2371 }
2075 2372
2076 delete $cf::MAP{$self->path}; 2373 delete $cf::MAP{$self->path};
2077 2374
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2377 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2378
2082 $self->unlink_save; 2379 $self->unlink_save;
2083 $self->destroy; 2380 $self->destroy;
2084} 2381}
2085 2382
2086my $nuke_counter = "aaaa"; 2383my $nuke_counter = "aaaa";
2087 2384
2088sub nuke { 2385sub nuke {
2089 my ($self) = @_; 2386 my ($self) = @_;
2090 2387
2388 {
2389 my $lock = cf::lock_acquire "map_data:$self->{path}";
2390
2091 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2092 2392
2093 $self->unlink_save; 2393 $self->unlink_save;
2094 2394
2095 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2096 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2400
2101 $cf::MAP{$self->path} = $self; 2401 $cf::MAP{$self->path} = $self;
2402 }
2102 2403
2103 $self->reset; # polite request, might not happen 2404 $self->reset; # polite request, might not happen
2104} 2405}
2105 2406
2106=item $maps = cf::map::tmp_maps 2407=item $maps = cf::map::tmp_maps
2148 2449
2149sub unique_maps() { 2450sub unique_maps() {
2150 [ 2451 [
2151 map { 2452 map {
2152 utf8::decode $_; 2453 utf8::decode $_;
2153 /\.map$/ 2454 s/\.map$//; # TODO future compatibility hack
2455 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2456 ? ()
2154 ? normalise $_ 2457 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2458 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2459 ]
2158} 2460}
2159 2461
2160package cf; 2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
2161 2493
2162=back 2494=back
2163 2495
2164=head3 cf::object 2496=head3 cf::object
2165 2497
2169 2501
2170=over 4 2502=over 4
2171 2503
2172=item $ob->inv_recursive 2504=item $ob->inv_recursive
2173 2505
2174Returns the inventory of the object _and_ their inventories, recursively. 2506Returns the inventory of the object I<and> their inventories, recursively,
2507but I<not> the object itself.
2175 2508
2176=cut 2509=cut
2177 2510
2178sub inv_recursive_; 2511sub inv_recursive_;
2179sub inv_recursive_ { 2512sub inv_recursive_ {
2182 2515
2183sub inv_recursive { 2516sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2517 inv_recursive_ inv $_[0]
2185} 2518}
2186 2519
2520=item $ref = $ob->ref
2521
2522Creates and returns a persistent reference to an object that can be stored as a string.
2523
2524=item $ob = cf::object::deref ($refstring)
2525
2526returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2527even if the object actually exists. May block.
2528
2529=cut
2530
2531sub deref {
2532 my ($ref) = @_;
2533
2534 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2535 my ($uuid, $name) = ($1, $2);
2536 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2537 or return;
2538 $pl->ob->uuid eq $uuid
2539 or return;
2540
2541 $pl->ob
2542 } else {
2543 warn "$ref: cannot resolve object reference\n";
2544 undef
2545 }
2546}
2547
2187package cf; 2548package cf;
2188 2549
2189=back 2550=back
2190 2551
2191=head3 cf::object::player 2552=head3 cf::object::player
2197Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2558Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2198can be C<undef>. Does the right thing when the player is currently in a 2559can be C<undef>. Does the right thing when the player is currently in a
2199dialogue with the given NPC character. 2560dialogue with the given NPC character.
2200 2561
2201=cut 2562=cut
2563
2564our $SAY_CHANNEL = {
2565 id => "say",
2566 title => "Map",
2567 reply => "say ",
2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2569};
2570
2571our $CHAT_CHANNEL = {
2572 id => "chat",
2573 title => "Chat",
2574 reply => "chat ",
2575 tooltip => "Player chat and shouts, global to the server.",
2576};
2202 2577
2203# rough implementation of a future "reply" method that works 2578# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2579# with dialog boxes.
2205#TODO: the first argument must go, split into a $npc->reply_to ( method 2580#TODO: the first argument must go, split into a $npc->reply_to ( method
2206sub cf::object::player::reply($$$;$) { 2581sub cf::object::player::reply($$$;$) {
2213 2588
2214 } else { 2589 } else {
2215 my $pl = $self->contr; 2590 my $pl = $self->contr;
2216 2591
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2592 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2593 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2594 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2595
2226 } else { 2596 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2597 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2598 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2599 }
2230 } 2600 }
2601}
2602
2603=item $object->send_msg ($channel, $msg, $color, [extra...])
2604
2605=cut
2606
2607sub cf::object::send_msg {
2608 my $pl = shift->contr
2609 or return;
2610 $pl->send_msg (@_);
2231} 2611}
2232 2612
2233=item $player_object->may ("access") 2613=item $player_object->may ("access")
2234 2614
2235Returns wether the given player is authorized to access resource "access" 2615Returns wether the given player is authorized to access resource "access"
2248 2628
2249=item $player_object->enter_link 2629=item $player_object->enter_link
2250 2630
2251Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2252 2632
2253The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
2254I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
2255 2637
2256Will never block. 2638Will never block.
2257 2639
2258=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
2259 2641
2279sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2280 my ($self) = @_; 2662 my ($self) = @_;
2281 2663
2282 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2283 2665
2666 ++$self->{_link_recursion};
2667
2284 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2285 2669
2286 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2287 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2288 2672
2289 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2290} 2674}
2291 2675
2292sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2293 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2294 2678
2311 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
2312 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
2313 2697
2314 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
2317 2701
2318 $map->load; 2702 $map->load;
2319 $map->load_diag; 2703 $map->load_neighbours;
2320 2704
2321 return unless $self->contr->active; 2705 return unless $self->contr->active;
2322 $self->activate_recursive;
2323 2706
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2325 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2326} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
2327 2714
2715}
2716
2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2329 2718
2330Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2331her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2332that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2333the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process. 2723be called at the end of this process.
2335 2724
2725Note that $check will be called with a potentially non-loaded map, so if
2726it needs a loaded map it has to call C<< ->load >>.
2727
2336=cut 2728=cut
2337 2729
2338our $GOTOGEN; 2730our $GOTOGEN;
2339 2731
2340sub cf::object::player::goto { 2732sub cf::object::player::goto {
2341 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2342 2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2740
2343 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2743
2346 $self->enter_link; 2744 $self->enter_link;
2347 2745
2348 (async { 2746 (async {
2747 $Coro::current->{desc} = "player::goto $path $x $y";
2748
2749 # *tag paths override both path and x|y
2750 if ($path =~ /^\*(.*)$/) {
2751 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2752 my $ob = $obs[rand @obs];
2753
2754 # see if we actually can go there
2755 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2756 $ob = $obs[rand @obs];
2757 } else {
2758 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2759 }
2760 # else put us there anyways for now #d#
2761
2762 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2763 } else {
2764 ($path, $x, $y) = (undef, undef, undef);
2765 }
2766 }
2767
2349 my $map = eval { 2768 my $map = eval {
2350 my $map = cf::map::find $path; 2769 my $map = defined $path ? cf::map::find $path : undef;
2351 2770
2352 if ($map) { 2771 if ($map) {
2353 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2355 } else { 2774 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2776 }
2358 2777
2359 $map 2778 $map
2360 }; 2779 };
2361 2780
2367 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2368 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2369 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2370 } 2789 }
2371 2790
2372 $done->() if $done; 2791 $done->($self) if $done;
2373 })->prio (1); 2792 })->prio (1);
2374} 2793}
2375 2794
2376=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2377 2796
2397} 2816}
2398 2817
2399sub prepare_random_map { 2818sub prepare_random_map {
2400 my ($exit) = @_; 2819 my ($exit) = @_;
2401 2820
2402 my $guard = cf::lock_acquire "exit_prepare:$exit";
2403
2404 # all this does is basically replace the /! path by 2821 # all this does is basically replace the /! path by
2405 # a new random map path (?random/...) with a seed 2822 # a new random map path (?random/...) with a seed
2406 # that depends on the exit object 2823 # that depends on the exit object
2407 2824
2408 my $rmp = parse_random_map_params $exit->msg; 2825 my $rmp = parse_random_map_params $exit->msg;
2410 if ($exit->map) { 2827 if ($exit->map) {
2411 $rmp->{region} = $exit->region->name; 2828 $rmp->{region} = $exit->region->name;
2412 $rmp->{origin_map} = $exit->map->path; 2829 $rmp->{origin_map} = $exit->map->path;
2413 $rmp->{origin_x} = $exit->x; 2830 $rmp->{origin_x} = $exit->x;
2414 $rmp->{origin_y} = $exit->y; 2831 $rmp->{origin_y} = $exit->y;
2832
2833 $exit->map->touch;
2415 } 2834 }
2416 2835
2417 $rmp->{random_seed} ||= $exit->random_seed; 2836 $rmp->{random_seed} ||= $exit->random_seed;
2418 2837
2419 my $data = cf::to_json $rmp; 2838 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2839 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2840 my $meta = "$RANDOMDIR/$md5.meta";
2422 2841
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2842 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2843 aio_write $fh, 0, (length $data), $data, 0;
2425 undef $fh; 2844 undef $fh;
2426 aio_rename "$meta~", $meta; 2845 aio_rename "$meta~", $meta;
2427 2846
2847 my $slaying = "?random/$md5";
2848
2849 if ($exit->valid) {
2428 $exit->slaying ("?random/$md5"); 2850 $exit->slaying ("?random/$md5");
2429 $exit->msg (undef); 2851 $exit->msg (undef);
2852 }
2430 } 2853 }
2431} 2854}
2432 2855
2433sub cf::object::player::enter_exit { 2856sub cf::object::player::enter_exit {
2434 my ($self, $exit) = @_; 2857 my ($self, $exit) = @_;
2435 2858
2436 return unless $self->type == cf::PLAYER; 2859 return unless $self->type == cf::PLAYER;
2437 2860
2438 if ($exit->slaying eq "/!") {
2439 #TODO: this should de-fi-ni-te-ly not be a sync-job
2440 # the problem is that $exit might not survive long enough
2441 # so it needs to be done right now, right here
2442 cf::sync_job { prepare_random_map $exit };
2443 }
2444
2445 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2446 my $hp = $exit->stats->hp;
2447 my $sp = $exit->stats->sp;
2448
2449 $self->enter_link; 2861 $self->enter_link;
2450 2862
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2455 (async { 2863 (async {
2456 $self->deactivate_recursive; # just to be sure 2864 $Coro::current->{desc} = "enter_exit";
2865
2457 unless (eval { 2866 unless (eval {
2867 $self->deactivate_recursive; # just to be sure
2868
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2878 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp;
2880
2458 $self->goto ($slaying, $hp, $sp); 2881 $self->goto ($map, $x, $y);
2459 2882
2883 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y)
2885 if $exit->flag (cf::FLAG_DAMNED);
2886
2460 1; 2887 1
2461 }) { 2888 }) {
2462 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2463 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2464 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2465 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2466 2893
2467 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2468 $self->leave_link; 2895 $self->leave_link;
2469 } 2896 }
2470 })->prio (1); 2897 })->prio (1);
2471} 2898}
2472 2899
2484sub cf::client::send_drawinfo { 2911sub cf::client::send_drawinfo {
2485 my ($self, $text, $flags) = @_; 2912 my ($self, $text, $flags) = @_;
2486 2913
2487 utf8::encode $text; 2914 utf8::encode $text;
2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916}
2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2489} 2941}
2490 2942
2491=item $client->send_msg ($channel, $msg, $color, [extra...]) 2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2492 2944
2493Send a drawinfo or msg packet to the client, formatting the msg for the 2945Send a drawinfo or msg packet to the client, formatting the msg for the
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2947the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2948the message unless the client supports the msg packet.
2497 2949
2498=cut 2950=cut
2499 2951
2952# non-persistent channels (usually the info channel)
2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2960 "c/identify" => {
2961 id => "infobox",
2962 title => "Identify",
2963 reply => undef,
2964 tooltip => "Items recently identified",
2965 },
2966 "c/examine" => {
2967 id => "infobox",
2968 title => "Examine",
2969 reply => undef,
2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2977 },
2978 "c/book" => {
2979 id => "infobox",
2980 title => "Book",
2981 reply => undef,
2982 tooltip => "The contents of a note or book",
2983 },
2984 "c/lookat" => {
2985 id => "infobox",
2986 title => "Look",
2987 reply => undef,
2988 tooltip => "What you saw there",
2989 },
2990 "c/who" => {
2991 id => "infobox",
2992 title => "Players",
2993 reply => undef,
2994 tooltip => "Shows players who are currently online",
2995 },
2996 "c/body" => {
2997 id => "infobox",
2998 title => "Body Parts",
2999 reply => undef,
3000 tooltip => "Shows which body parts you posess and are available",
3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
3038 "c/uptime" => {
3039 id => "infobox",
3040 title => "Uptime",
3041 reply => undef,
3042 tooltip => "How long the server has been running since last restart",
3043 },
3044 "c/mapinfo" => {
3045 id => "infobox",
3046 title => "Map Info",
3047 reply => undef,
3048 tooltip => "Information related to the maps",
3049 },
3050 "c/party" => {
3051 id => "party",
3052 title => "Party",
3053 reply => "gsay ",
3054 tooltip => "Messages and chat related to your party",
3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
3064);
3065
2500sub cf::client::send_msg { 3066sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 3067 my ($self, $channel, $msg, $color, @extra) = @_;
2502 3068
2503 $msg = $self->pl->expand_cfpod ($msg); 3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
2504 3071
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 3073
3074 # check predefined channels, for the benefit of C
3075 if ($CHANNEL{$channel}) {
3076 $channel = $CHANNEL{$channel};
3077
3078 $self->ext_msg (channel_info => $channel);
3079 $channel = $channel->{id};
3080
2507 if (ref $channel) { 3081 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 3082 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 3083 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 3084 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 3085 $self->ext_msg (channel_info => $channel);
2512 } 3086 }
2513 3087
2514 $channel = $channel->{id}; 3088 $channel = $channel->{id};
2515 } 3089 }
2516 3090
2517 return unless @extra || length $msg; 3091 return unless @extra || length $msg;
2518 3092
2519 if ($self->can_msg) { 3093 # default colour, mask it out
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2521 } else { 3095 if $color & cf::NDI_DEF;
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531 3096
2532 if ($color >= 0) { 3097 my $pkt = "msg "
2533 if (0 && $msg =~ /\[/) { 3098 . $self->{json_coder}->encode (
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2535 } else { 3100 );
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg")
2538 }
2539 }
2540 }
2541}
2542 3101
3102 $self->send_big_packet ($pkt);
3103}
3104
2543=item $client->ext_event ($type, %msg) 3105=item $client->ext_msg ($type, @msg)
2544 3106
2545Sends an ext event to the client. 3107Sends an ext event to the client.
2546 3108
2547=cut 3109=cut
2548 3110
2549sub cf::client::ext_event($$%) { 3111sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 3112 my ($self, $type, @msg) = @_;
2551 3113
2552 return unless $self->extcmd; 3114 if ($self->extcmd == 2) {
2553 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 3117 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119 }
3120}
3121
3122=item $client->ext_reply ($msgid, @msg)
3123
3124Sends an ext reply to the client.
3125
3126=cut
3127
3128sub cf::client::ext_reply($$@) {
3129 my ($self, $id, @msg) = @_;
3130
3131 if ($self->extcmd == 2) {
3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133 } elsif ($self->extcmd == 1) {
3134 #TODO: version 1, remove
3135 unshift @msg, msgtype => "reply", msgid => $id;
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137 }
2556} 3138}
2557 3139
2558=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2559 3141
2560Queues a query to the client, calling the given callback with 3142Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 3197 my ($ns, $buf) = @_;
2616 3198
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3199 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 3200
2619 if (ref $msg) { 3201 if (ref $msg) {
3202 my ($type, $reply, @payload) =
3203 "ARRAY" eq ref $msg
3204 ? @$msg
3205 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206
3207 my @reply;
3208
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3209 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 3210 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 3211 }
3212
3213 $ns->ext_reply ($reply, @reply)
3214 if $reply;
3215
2626 } else { 3216 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 3218 }
2629 3219
2630 cf::override; 3220 cf::override;
2631 }, 3221 },
2632); 3222);
2652 3242
2653 $coro 3243 $coro
2654} 3244}
2655 3245
2656cf::client->attach ( 3246cf::client->attach (
2657 on_destroy => sub { 3247 on_client_destroy => sub {
2658 my ($ns) = @_; 3248 my ($ns) = @_;
2659 3249
2660 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2661 }, 3251 },
2662); 3252);
2677our $safe = new Safe "safe"; 3267our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
2679 3269
2680$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
2681 3271
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3272$safe->permit_only (Opcode::opset qw(
3273 :base_core :base_mem :base_orig :base_math :base_loop
3274 grepstart grepwhile mapstart mapwhile
3275 sort time
3276));
2683 3277
2684# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
2685 3279
2686=pod 3280=pod
2687 3281
2688The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
2689 3283
2690 cf::object 3284 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3285 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3286 insert remove name archname title slaying race decrease split
3287 value
2693 3288
2694 cf::object::player 3289 cf::object::player
2695 player 3290 player
2696 3291
2697 cf::player 3292 cf::player
2702 3297
2703=cut 3298=cut
2704 3299
2705for ( 3300for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)], 3302 insert remove inv nrof name archname title slaying race
3303 decrease split destroy change_exp value msg lore send_msg)],
2708 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
2710 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
2711) { 3307) {
2712 no strict 'refs';
2713 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
2714 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2715 for @funs; 3310 for @funs;
2716} 3311}
2717 3312
2732 3327
2733 my $qcode = $code; 3328 my $qcode = $code;
2734 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2735 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
2736 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
2737 local $_; 3335 local $_;
2738 local @safe::cf::_safe_eval_args = values %vars;
2739 3336
2740 my $eval = 3337 my $eval =
2741 "do {\n" 3338 "do {\n"
2742 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2743 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
2744 . $code 3341 . $code
2745 . "\n}" 3342 . "\n}"
2746 ; 3343 ;
2747 3344
3345 if ($CFG{safe_eval}) {
2748 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
2749 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2750 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
2751 3354
2752 if ($@) { 3355 if ($@) {
2753 warn "$@"; 3356 warn "$@",
2754 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
2755 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
2756 } 3359 }
2757 3360
2758 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
2759} 3362}
2760 3363
2774=cut 3377=cut
2775 3378
2776sub register_script_function { 3379sub register_script_function {
2777 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
2778 3381
2779 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
2780 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
2781} 3384}
2782 3385
2783=back 3386=back
2784 3387
2785=cut 3388=cut
2788# the server's init and main functions 3391# the server's init and main functions
2789 3392
2790sub load_facedata($) { 3393sub load_facedata($) {
2791 my ($path) = @_; 3394 my ($path) = @_;
2792 3395
3396 # HACK to clear player env face cache, we need some signal framework
3397 # for this (global event?)
3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3399
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401
2793 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
2794 3403
2795 my $facedata;
2796 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
2797 or die "$path: $!"; 3405 or die "$path: $!";
2798 3406
2799 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
2800 3408
2801 $facedata->{version} == 2 3409 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 3411
3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3414 $facedata->{resource}{"res/exp_table"} = {
3415 type => FT_RSRC,
3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3418 };
3419 cf::cede_to_tick;
3420
2804 { 3421 {
2805 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
2806 3423
2807 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426
2809 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2813 3432
2814 cf::cede_to_tick; 3433 cf::cede_to_tick;
2815 } 3434 }
2816 3435
2817 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3437 next unless $info->{smooth};
3438
2819 my $idx = cf::face::find $face 3439 my $idx = cf::face::find $face
2820 or next; 3440 or next;
3441
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3445 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
2826 } 3447 }
2827 3448
2828 cf::cede_to_tick; 3449 cf::cede_to_tick;
2829 } 3450 }
2830 } 3451 }
2839 3460
2840 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
2841 } 3462 }
2842 3463
2843 { 3464 {
2844 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3465 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3466
2849 while (my ($name, $info) = each %$res) { 3467 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3468 if (defined $info->{type}) {
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2857 3470
2858 if ($name =~ /\.jpg$/) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3472 cf::face::set_type $idx, $info->{type};
2861 } else { 3473 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3474 $RESOURCE{$name} = $info; # unused
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3475 }
2868 3476
2869 cf::cede_to_tick; 3477 cf::cede_to_tick;
2870 } 3478 }
2871 } 3479 }
2872 3480
3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3482
2873 1 3483 1
2874} 3484}
2875 3485
3486register_exticmd fx_want => sub {
3487 my ($ns, $want) = @_;
3488
3489 while (my ($k, $v) = each %$want) {
3490 $ns->fx_want ($k, $v);
3491 }
3492};
3493
3494sub load_resource_file($) {
3495 my $guard = lock_acquire "load_resource_file";
3496
3497 my $status = load_resource_file_ $_[0];
3498 get_slot 0.1, 100;
3499 cf::arch::commit_load;
3500
3501 $status
3502}
3503
2876sub reload_regions { 3504sub reload_regions {
3505 # HACK to clear player env face cache, we need some signal framework
3506 # for this (global event?)
3507 %ext::player_env::MUSIC_FACE_CACHE = ();
3508
2877 load_resource_file "$MAPDIR/regions" 3509 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3510 or die "unable to load regions file\n";
2879 3511
2880 for (cf::region::list) { 3512 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3513 $_->{match} = qr/$_->{match}/
2889} 3521}
2890 3522
2891sub reload_archetypes { 3523sub reload_archetypes {
2892 load_resource_file "$DATADIR/archetypes" 3524 load_resource_file "$DATADIR/archetypes"
2893 or die "unable to load archetypes\n"; 3525 or die "unable to load archetypes\n";
2894 #d# NEED to laod twice to resolve forward references
2895 # this really needs to be done in an extra post-pass
2896 # (which needs to be synchronous, so solve it differently)
2897 load_resource_file "$DATADIR/archetypes"
2898 or die "unable to load archetypes\n";
2899} 3526}
2900 3527
2901sub reload_treasures { 3528sub reload_treasures {
2902 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
2903 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
2904} 3531}
2905 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
2906sub reload_resources { 3556sub reload_resources {
2907 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
2908 3558
3559 reload_exp_table;
3560 reload_materials;
3561 reload_facedata;
3562 reload_sound;
3563 reload_archetypes;
2909 reload_regions; 3564 reload_regions;
2910 reload_facedata;
2911 #reload_archetypes;#d#
2912 reload_archetypes;
2913 reload_treasures; 3565 reload_treasures;
2914 3566
2915 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
2916} 3568}
2917 3569
2918sub init { 3570sub reload_config {
2919 reload_resources; 3571 trace "reloading config file...\n";
2920}
2921 3572
2922sub cfg_load { 3573 0 < aio_load "$CONFDIR/config", my $config
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3574 or die "$CONFDIR/config: $!";
2924 or return;
2925 3575
2926 local $/; 3576 utf8::decode $config;
2927 *CFG = YAML::Syck::Load <$fh>; 3577 *CFG = yaml_load $config;
2928 3578
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2930 3580
2931 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2932 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2933 3583
2934 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
2938 }; 3588 };
2939 warn $@ if $@; 3589 warn $@ if $@;
2940 } 3590 }
2941} 3591}
2942 3592
3593sub pidfile() {
3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3595 or die "$PIDFILE: $!";
3596 flock $fh, &Fcntl::LOCK_EX
3597 or die "$PIDFILE: flock: $!";
3598 $fh
3599}
3600
3601# make sure only one server instance is running at any one time
3602sub atomic {
3603 my $fh = pidfile;
3604
3605 my $pid = <$fh>;
3606 kill 9, $pid if $pid > 0;
3607
3608 seek $fh, 0, 0;
3609 print $fh $$;
3610}
3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
2943sub main { 3621sub main {
3622 cf::init_globals; # initialise logging
3623
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630
2944 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3634 (async {
2948 Event::one_event; 3635 $Coro::current->{desc} = "IDLE BUG HANDLER";
3636 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3637 })->prio (Coro::PRIO_MAX);
2950 }; 3638 };
2951 3639
2952 cfg_load; 3640 evthread_start IO::AIO::poll_fileno;
3641
3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3651 reload_resources;
3652 reload_config;
2953 db_init; 3653 db_init;
3654
3655 cf::init_uuid;
3656 cf::init_signals;
3657 cf::init_skills;
3658
3659 cf::init_beforeplay;
3660
3661 atomic;
3662
2954 load_extensions; 3663 load_extensions;
2955 3664
2956 $TICK_WATCHER->start; 3665 utime time, time, $RUNTIMEFILE;
2957 Event::loop; 3666
3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3670
3671 cf::_post_init 0;
3672 };
3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
2958} 3683}
2959 3684
2960############################################################################# 3685#############################################################################
2961# initialisation and cleanup 3686# initialisation and cleanup
2962 3687
2963# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
2964BEGIN { 3689BEGIN {
3690 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2967 reentrant => 0,
2968 data => WF_AUTOCANCEL,
2969 signal => $signal,
2970 prio => 0,
2971 cb => sub {
2972 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
2973 },
2974 ); 3694 };
2975 } 3695 }
2976} 3696}
2977 3697
2978sub write_runtime { 3698sub write_runtime_sync {
2979 my $runtime = "$LOCALDIR/runtime"; 3699 my $t0 = AE::time;
2980 3700
2981 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
2983 3703
2984 IO::AIO::aio_utime $runtime, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2985 3705
2986 my $guard = cf::lock_acquire "write_runtime"; 3706 my $guard = cf::lock_acquire "write_runtime";
2987 3707
2988 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2989 or return; 3709 or return;
2990 3710
2991 my $value = $cf::RUNTIME + 90 + 10; 3711 my $value = $cf::RUNTIME + 90 + 10;
2992 # 10 is the runtime save interval, for a monotonic clock 3712 # 10 is the runtime save interval, for a monotonic clock
2993 # 60 allows for the watchdog to kill the server. 3713 # 60 allows for the watchdog to kill the server.
3003 aio_utime $fh, undef, undef; 3723 aio_utime $fh, undef, undef;
3004 3724
3005 close $fh 3725 close $fh
3006 or return; 3726 or return;
3007 3727
3008 aio_rename "$runtime~", $runtime 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3009 and return; 3729 and return;
3010 3730
3011 warn "runtime file written.\n"; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3012 3732
3013 1 3733 1
3734}
3735
3736our $uuid_lock;
3737our $uuid_skip;
3738
3739sub write_uuid_sync($) {
3740 $uuid_skip ||= $_[0];
3741
3742 return if $uuid_lock;
3743 local $uuid_lock = 1;
3744
3745 my $uuid = "$LOCALDIR/uuid";
3746
3747 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3748 or return;
3749
3750 my $value = uuid_seq uuid_cur;
3751
3752 unless ($value) {
3753 info "cowardly refusing to write zero uuid value!\n";
3754 return;
3755 }
3756
3757 my $value = uuid_str $value + $uuid_skip;
3758 $uuid_skip = 0;
3759
3760 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3761 and return;
3762
3763 # always fsync - this file is important
3764 aio_fsync $fh
3765 and return;
3766
3767 close $fh
3768 or return;
3769
3770 aio_rename "$uuid~", $uuid
3771 and return;
3772
3773 trace "uuid file written ($value).\n";
3774
3775 1
3776
3777}
3778
3779sub write_uuid($$) {
3780 my ($skip, $sync) = @_;
3781
3782 $sync ? write_uuid_sync $skip
3783 : async { write_uuid_sync $skip };
3014} 3784}
3015 3785
3016sub emergency_save() { 3786sub emergency_save() {
3017 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3018 3788
3019 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3020 3795
3021 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
3022 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3023 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3024 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3026 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3805 $pl->valid or next;
3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3807 $pl->save;
3030 } 3808 }
3031 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
3032 3810
3033 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
3034 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3035 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3036 $map->valid or next; 3816 $map->valid or next;
3037 $map->save; 3817 $map->save;
3038 } 3818 }
3039 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
3040 3820
3041 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
3042 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3043 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3826
3827 info "emergency_perl_save: begin write uuid\n";
3828 write_uuid_sync 1;
3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3044 }; 3849 };
3045 3850
3046 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
3047} 3852}
3048 3853
3049sub post_cleanup { 3854sub post_cleanup {
3050 my ($make_core) = @_; 3855 my ($make_core) = @_;
3051 3856
3857 IO::AIO::flush;
3858
3052 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3053 if $make_core; 3860 if $make_core;
3861
3862 my $fh = pidfile;
3863 unlink $PIDFILE if <$fh> == $$;
3864}
3865
3866# a safer delete_package, copied from Symbol
3867sub clear_package($) {
3868 my $pkg = shift;
3869
3870 # expand to full symbol table name if needed
3871 unless ($pkg =~ /^main::.*::$/) {
3872 $pkg = "main$pkg" if $pkg =~ /^::/;
3873 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3874 $pkg .= '::' unless $pkg =~ /::$/;
3875 }
3876
3877 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3878 my $stem_symtab = *{$stem}{HASH};
3879
3880 defined $stem_symtab and exists $stem_symtab->{$leaf}
3881 or return;
3882
3883 # clear all symbols
3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3885 for my $name (keys %$leaf_symtab) {
3886 _gv_clear *{"$pkg$name"};
3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3888 }
3054} 3889}
3055 3890
3056sub do_reload_perl() { 3891sub do_reload_perl() {
3057 # can/must only be called in main 3892 # can/must only be called in main
3058 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3059 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3060 return; 3895 return;
3061 } 3896 }
3062 3897
3063 warn "reloading..."; 3898 return if $RELOAD++;
3064 3899
3065 warn "entering sync_job"; 3900 my $t1 = AE::time;
3066 3901
3902 while ($RELOAD) {
3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3905
3906 trace "perl_reload: entering sync_job";
3907
3067 cf::sync_job { 3908 cf::sync_job {
3068 cf::write_runtime; # external watchdog should not bark
3069 cf::emergency_save; 3909 #cf::emergency_save;
3070 cf::write_runtime; # external watchdog should not bark
3071 3910
3072 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV;
3074
3075 # if anything goes wrong in here, we should simply crash as we already saved
3076
3077 warn "cancelling all WF_AUTOCANCEL watchers";
3078 for (Event::all_watchers) {
3079 $_->cancel if $_->data & WF_AUTOCANCEL;
3080 }
3081
3082 warn "flushing outstanding aio requests";
3083 for (;;) {
3084 BDB::flush;
3085 IO::AIO::flush;
3086 Coro::cede;
3087 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate...";
3089 }
3090
3091 ++$RELOAD;
3092
3093 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3094 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3095 %EXT_CORO = (); 3913 %EXT_CORO = ();
3096 3914
3097 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3098 %COMMAND = (); 3916 %COMMAND = ();
3099 3917
3100 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3101 %EXTCMD = (); 3919 %EXTCMD = ();
3102 %EXTICMD = (); 3920 %EXTICMD = ();
3103 3921
3104 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3105 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3106 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3107 3925
3108 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3109 eval { 3927 eval {
3110 $cb->($pkg); 3928 $cb->($pkg);
3111 1 3929 1
3112 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3931 }
3932
3933 trace "... clearing $pkg";
3934 clear_package $pkg;
3113 } 3935 }
3114 3936
3115 warn "... nuking $pkg";
3116 Symbol::delete_package $pkg;
3117 }
3118
3119 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3120 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3121 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3122 3940
3123 warn "... unloading $k"; 3941 trace "... unloading $k";
3124 delete $INC{$k}; 3942 delete $INC{$k};
3125 3943
3126 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3127 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3128 3946
3129 if (my $cb = $k->can ("unload_module")) { 3947 if (my $cb = $k->can ("unload_module")) {
3130 $cb->(); 3948 $cb->();
3949 }
3950
3951 clear_package $k;
3131 } 3952 }
3132 3953
3133 Symbol::delete_package $k;
3134 }
3135
3136 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3137 Symbol::delete_package "safe::$_" 3955 clear_package "safe::$_"
3138 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3139 3957
3140 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3141 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3142 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3143 3961
3144 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3145 # and global variables created in xs 3963 # and global variables created in xs
3146 #Symbol::delete_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3147 3965
3148 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3149 3967
3150 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3151 require cf; 3969 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
3153 3971
3154 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3155 cf::cfg_load; 3973 cf::reload_config;
3156 3974
3157 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3158 cf::load_extensions; 3976 cf::load_extensions;
3159 3977
3978 if ($REATTACH_ON_RELOAD) {
3160 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3161 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3162 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3163 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3164 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3165 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
3166 3986
3167 warn "leaving sync_job"; 3987 cf::_post_init 1;
3168 3988
3989 trace "perl_reload: leaving sync_job";
3990
3169 1 3991 1
3170 } or do { 3992 } or do {
3171 warn $@; 3993 error $@;
3172 warn "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3173 exit 1; 3995 };
3996
3997 --$RELOAD;
3174 }; 3998 }
3175 3999
3176 warn "reloaded"; 4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
3177}; 4002};
3178 4003
3179our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3180 4005
3181sub reload_perl() { 4006sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3184 4009
3185 $RELOAD_WATCHER ||= Event->timer ( 4010 $RELOAD_WATCHER ||= cf::async {
3186 reentrant => 0, 4011 Coro::AIO::aio_wait cache_extensions;
3187 after => 0, 4012
3188 data => WF_AUTOCANCEL, 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3189 cb => sub {
3190 do_reload_perl; 4014 do_reload_perl;
3191 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3192 }, 4016 };
3193 ); 4017 };
3194} 4018}
3195 4019
3196register_command "reload" => sub { 4020register_command "reload" => sub {
3197 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
3198 4022
3199 if ($who->flag (FLAG_WIZ)) { 4023 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 4024 $who->message ("reloading server.");
4025 async {
4026 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 4027 reload_perl;
4028 };
3202 } 4029 }
3203}; 4030};
3204 4031
3205unshift @INC, $LIBDIR; 4032#############################################################################
3206 4033
3207my $bug_warning = 0; 4034my $bug_warning = 0;
3208 4035
3209our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3210our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3211 4038
3212sub wait_for_tick { 4039sub wait_for_tick() {
3213 return unless $TICK_WATCHER->is_active;
3214 return if $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3215 4041
3216 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3217 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3218 $signal->wait; 4044 $signal->wait;
3219} 4045}
3220 4046
3221sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3222 return unless $TICK_WATCHER->is_active;
3223 return if $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3224 4049
3225 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 4052 $signal->wait;
3228} 4053}
3229 4054
3230 my $min = 1e6;#d# 4055sub tick {
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer (
3233 reentrant => 0,
3234 parked => 1,
3235 prio => 0,
3236 at => $NEXT_TICK || $TICK,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 if ($Coro::current != $Coro::main) { 4056 if ($Coro::current != $Coro::main) {
3240 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3241 unless ++$bug_warning > 10; 4058 unless ++$bug_warning > 10;
3242 return; 4059 return;
3243 } 4060 }
3244 4061
3245 $NOW = $tick_start = Event::time;
3246
3247 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3248 4063
3249 0 && sync_job {#d# 4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254 4065
3255 $map->width (50); 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3256 $map->height (50); 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3257 $map->alloc; 4068 Coro::async_pool {
3258 $map->_load_objects ("/tmp/x.map", 1); 4069 $Coro::current->{desc} = "runtime saver";
3259 my $t = Event::time - $t; 4070 write_runtime_sync
3260 4071 or error "ERROR: unable to write runtime file: $!";
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 }; 4072 };
4073 }
3271 4074
3272 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK;
3274
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool {
3278 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!";
3280 };
3281 }
3282
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 4076 $sig->send;
3288 } 4077 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 4078 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 4079 $sig->send;
3291 } 4080 }
3292 4081
3293 $NOW = Event::time; 4082 $LOAD = ($NOW - $TICK_START) / $TICK;
3294
3295 # if we are delayed by four ticks or more, skip them all
3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298 $TICK_WATCHER->at ($NEXT_TICK);
3299 $TICK_WATCHER->start;
3300
3301 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4083 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 4084
3304 _post_tick; 4085 if (0) {
3305 4086 if ($NEXT_TICK) {
3306 4087 my $jitter = $TICK_START - $NEXT_TICK;
4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4089 debug "jitter $JITTER\n";#d#
4090 }
3307 }, 4091 }
3308); 4092}
3309 4093
3310{ 4094{
3311 BDB::max_poll_time $TICK * 0.1; 4095 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 4096
3313 reentrant => 0,
3314 fd => BDB::poll_fileno,
3315 poll => 'r',
3316 prio => 0,
3317 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb,
3319 );
3320 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
3321 4098 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 4099 $AnyEvent::BDB::WATCHER->priority (1);
3323 my $status;
3324 my $current = $Coro::current;
3325 (
3326 sub {
3327 $status = $!;
3328 $current->ready; undef $current;
3329 },
3330 sub {
3331 Coro::schedule while defined $current;
3332 $! = $status;
3333 },
3334 )
3335 };
3336 4100
3337 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
4103 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4104 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4105 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4106 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4107 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 4108
3340 cf::sync_job { 4109 cf::sync_job {
3341 eval { 4110 eval {
3342 BDB::db_env_open 4111 BDB::db_env_open
3343 $DB_ENV, 4112 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4114 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4115 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 4116 0666;
3348 4117
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4118 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 4119 };
3354 4120
3355 cf::cleanup "db_env_open(db): $@" if $@; 4121 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 4122 };
3357 } 4123 }
4124
4125 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4126 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4127 };
4128 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4129 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130 };
4131 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133 };
3358} 4134}
3359 4135
3360{ 4136{
4137 # configure IO::AIO
4138
3361 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 4141 undef $AnyEvent::AIO::WATCHER;
3366 reentrant => 0,
3367 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno,
3369 poll => 'r',
3370 prio => 6,
3371 cb => \&IO::AIO::poll_cb,
3372 );
3373} 4142}
3374 4143
3375my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
3376 4146
3377sub _log_backtrace { 4147sub _log_backtrace {
3378 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
3379 4149
3380 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
3381 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3382 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
3384 ++$_log_backtrace; 4158 ++$_log_backtrace;
4159 my $perl_bt = Carp::longmess $msg;
3385 async { 4160 async {
4161 $Coro::current->{desc} = "abt $msg";
4162
3386 my @bt = fork_call { 4163 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 4164 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4165 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4166 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 4167 or die "addr2line: $!";
3398 } 4175 }
3399 4176
3400 @funcs 4177 @funcs
3401 }; 4178 };
3402 4179
3403 LOG llevInfo, "[ABT] $msg\n"; 4180 LOG llevInfo, "[ABT] $perl_bt\n";
4181 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3404 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3405 --$_log_backtrace; 4183 --$_log_backtrace;
3406 }; 4184 };
3407 } else { 4185 } else {
3408 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3409 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3410 } 4188 }
3411} 4189}
3412 4190
3413# load additional modules 4191# load additional modules
3414use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3415 4194
3416END { cf::emergency_save } 4195END { cf::emergency_save }
3417 4196
34181 41971
3419 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines