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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines