ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines