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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.518 by root, Fri Apr 16 02:21:26 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 124our $DB_ENV;
89 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
105 150
106binmode STDOUT; 151binmode STDOUT;
107binmode STDERR; 152binmode STDERR;
108 153
109# read virtual server time, if available 154# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
114} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
115 162
116mkdir $_ 163mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 165
119our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
120 167
121sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 180
123############################################################################# 181#############################################################################
124 182
125=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
126 184
162 220
163The raw value load value from the last tick. 221The raw value load value from the last tick.
164 222
165=item %cf::CFG 223=item %cf::CFG
166 224
167Configuration for the server, loaded from C</etc/crossfire/config>, or 225Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 226from wherever your confdir points to.
169 227
170=item cf::wait_for_tick, cf::wait_for_tick_begin 228=item cf::wait_for_tick, cf::wait_for_tick_begin
171 229
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 233
176=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
177 235
178This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 238that call.
181 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
182=back 246=back
183 247
184=cut 248=cut
185 249
186BEGIN { 250$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 251 my $msg = join "", @_;
189 252
190 $msg .= "\n" 253 $msg .= "\n"
191 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
192 255
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 257
195 LOG llevError, $msg; 258 LOG llevError, $msg;
196 }; 259};
197} 260
261$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
265
266 if ($Coro::current == $Coro::main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d#
269 }#d#
270
271 # kill coroutine otherwise
272 Coro::terminate
273};
198 274
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 285for my $pkg (qw(
210 cf::global cf::attachable 286 cf::global cf::attachable
211 cf::object cf::object::player 287 cf::object cf::object::player
212 cf::client cf::player 288 cf::client cf::player
213 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
214 cf::map cf::party cf::region 291 cf::party cf::region
215)) { 292)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 294}
219 295
220$Event::DIED = sub { 296$EV::DIED = sub {
221 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
222}; 298};
223 299
224############################################################################# 300#############################################################################
225 301
226=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 324 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 325 $d
250 } || "[unable to dump $_[0]: '$@']"; 326 } || "[unable to dump $_[0]: '$@']";
251} 327}
252 328
253=item $ref = cf::from_json $json 329=item $ref = cf::decode_json $json
254 330
255Converts a JSON string into the corresponding perl data structure. 331Converts a JSON string into the corresponding perl data structure.
256 332
257=item $json = cf::to_json $ref 333=item $json = cf::encode_json $ref
258 334
259Converts a perl data structure into its JSON representation. 335Converts a perl data structure into its JSON representation.
260 336
261=cut 337=cut
262 338
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 340
265sub to_json ($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
267 357
268=item cf::lock_wait $string 358=item cf::lock_wait $string
269 359
270Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
271 361
272=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
273 363
274Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
277returned. 367returned.
278 368
279Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 370deadlocked coro.
286 376
287Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
288 378
289=cut 379=cut
290 380
291our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 382
294sub lock_wait($) { 383sub lock_wait($) {
295 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 385}
308 386
309sub lock_acquire($) { 387sub lock_acquire($) {
310 my ($key) = @_; 388 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 389}
324 390
325sub lock_active($) { 391sub lock_active($) {
326 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 393}
330 394
331sub freeze_mainloop { 395sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 396 tick_inhibit_inc;
333 397
334 my $guard = Coro::guard { 398 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 399}
336 }; 400
337 $TICK_WATCHER->stop; 401=item cf::periodic $interval, $cb
338 $guard 402
403Like EV::periodic, but randomly selects a starting point so that the actions
404get spread over time.
405
406=cut
407
408sub periodic($$) {
409 my ($interval, $cb) = @_;
410
411 my $start = rand List::Util::min 180, $interval;
412
413 EV::periodic $start, $interval, 0, $cb
339} 414}
340 415
341=item cf::get_slot $time[, $priority[, $name]] 416=item cf::get_slot $time[, $priority[, $name]]
342 417
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 418Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 426
352=cut 427=cut
353 428
354our @SLOT_QUEUE; 429our @SLOT_QUEUE;
355our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
356 432
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
435 $Coro::current->desc ("timeslot manager");
436
359 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
360 439
361 while () { 440 while () {
362 next_job: 441 next_job:
442
363 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
364 if ($avail > 0.01) { 444
365 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
367 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send; 449 $job->[2]->send;
369 Coro::cede; 450 Coro::cede;
370 goto next_job; 451 goto next_job;
371 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
372 } 454 }
373 } 455 }
374 456
375 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 460 $signal->wait;
379 } else { 461 } else {
462 $busy = 0;
380 Coro::schedule; 463 Coro::schedule;
381 } 464 }
382 } 465 }
383}; 466};
384 467
385sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
386 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
387 472
388 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
389 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
390 476
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
404 490
405BEGIN { *async = \&Coro::async_pool } 491BEGIN { *async = \&Coro::async_pool }
406 492
407=item cf::sync_job { BLOCK } 493=item cf::sync_job { BLOCK }
408 494
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 495The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 496is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 497partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 498acceptable.
413 499
414If it must be done, put the blocking parts into C<sync_job>. This will run 500If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 501the given BLOCK in another coroutine while waiting for the result. The
420 506
421sub sync_job(&) { 507sub sync_job(&) {
422 my ($job) = @_; 508 my ($job) = @_;
423 509
424 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 511 my $time = AE::time;
426 512
427 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
429 515
430 # TODO: use suspend/resume instead 516 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 517
432 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
433 519
434 my $busy = 1; 520 my $busy = 1;
435 my @res; 521 my @res;
436 522
437 (async { 523 (async {
524 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 525 @res = eval { $job->() };
439 warn $@ if $@; 526 warn $@ if $@;
440 undef $busy; 527 undef $busy;
441 })->prio (Coro::PRIO_MAX); 528 })->prio (Coro::PRIO_MAX);
442 529
443 while ($busy) { 530 while ($busy) {
444 Coro::cede or Event::one_event; 531 if (Coro::nready) {
532 Coro::cede_notself;
533 } else {
534 EV::loop EV::LOOP_ONESHOT;
445 } 535 }
536 }
446 537
447 $time = Event::time - $time; 538 my $time = AE::time - $time;
448 539
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
453 541
454 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
455 } else { 543 } else {
456 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
457 545
482=item fork_call { }, $args 570=item fork_call { }, $args
483 571
484Executes the given code block with the given arguments in a seperate 572Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 573process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 574Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 575never block itself or use any form of event handling.
488 576
489=cut 577=cut
490 578
491sub fork_call(&@) { 579sub fork_call(&@) {
492 my ($cb, @args) = @_; 580 my ($cb, @args) = @_;
499 reset_signals; 587 reset_signals;
500 &$cb 588 &$cb
501 }, @args; 589 }, @args;
502 590
503 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
603}
604
605=item $coin = coin_from_name $name
606
607=cut
608
609our %coin_alias = (
610 "silver" => "silvercoin",
611 "silvercoin" => "silvercoin",
612 "silvercoins" => "silvercoin",
613 "gold" => "goldcoin",
614 "goldcoin" => "goldcoin",
615 "goldcoins" => "goldcoin",
616 "platinum" => "platinacoin",
617 "platinumcoin" => "platinacoin",
618 "platinumcoins" => "platinacoin",
619 "platina" => "platinacoin",
620 "platinacoin" => "platinacoin",
621 "platinacoins" => "platinacoin",
622 "royalty" => "royalty",
623 "royalties" => "royalty",
624);
625
626sub coin_from_name($) {
627 $coin_alias{$_[0]}
628 ? cf::arch::find $coin_alias{$_[0]}
629 : undef
504} 630}
505 631
506=item $value = cf::db_get $family => $key 632=item $value = cf::db_get $family => $key
507 633
508Returns a single value from the environment database. 634Returns a single value from the environment database.
647 773
648############################################################################# 774#############################################################################
649 775
650=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
651 777
652Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
655 781
656In the following description, CLASS can be any of C<global>, C<object> 782In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 783C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 784Deliantra).
659 785
660=over 4 786=over 4
661 787
662=item $attachable->attach ($attachment, key => $value...) 788=item $attachable->attach ($attachment, key => $value...)
663 789
707=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
708 834
709Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
711 837
712Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
714 840
715These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
716 842
717=over 4 843=over 4
945 } 1071 }
946 1072
947 0 1073 0
948} 1074}
949 1075
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1076=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1077
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1078=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1079
954Generate an object-specific event with the given arguments. 1080Generate an object-specific event with the given arguments.
955 1081
961 1087
962=cut 1088=cut
963 1089
964############################################################################# 1090#############################################################################
965# object support 1091# object support
966#
967 1092
1093sub _object_equal($$);
1094sub _object_equal($$) {
1095 my ($a, $b) = @_;
1096
1097 return 0 unless (ref $a) eq (ref $b);
1098
1099 if ("HASH" eq ref $a) {
1100 my @ka = keys %$a;
1101 my @kb = keys %$b;
1102
1103 return 0 if @ka != @kb;
1104
1105 for (0 .. $#ka) {
1106 return 0 unless $ka[$_] eq $kb[$_];
1107 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1108 }
1109
1110 } elsif ("ARRAY" eq ref $a) {
1111
1112 return 0 if @$a != @$b;
1113
1114 for (0 .. $#$a) {
1115 return 0 unless _object_equal $a->[$_], $b->[$_];
1116 }
1117
1118 } elsif ($a ne $b) {
1119 return 0;
1120 }
1121
1122 1
1123}
1124
1125our $SLOW_MERGES;#d#
968sub _can_merge { 1126sub _can_merge {
969 my ($ob1, $ob2) = @_; 1127 my ($ob1, $ob2) = @_;
970 1128
971 local $Storable::canonical = 1; 1129 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1130
975 $fob1 eq $fob2 1131 # we do the slow way here
1132 return _object_equal $ob1, $ob2
976} 1133}
977 1134
978sub reattach { 1135sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1137 my ($obj) = @_;
981 1138
1139 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1141
984 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
985 1143
986 @$registry = (); 1144 @$registry = ();
987 1145
1002cf::attachable->attach ( 1160cf::attachable->attach (
1003 prio => -1000000, 1161 prio => -1000000,
1004 on_instantiate => sub { 1162 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1163 my ($obj, $data) = @_;
1006 1164
1007 $data = from_json $data; 1165 $data = decode_json $data;
1008 1166
1009 for (@$data) { 1167 for (@$data) {
1010 my ($name, $args) = @$_; 1168 my ($name, $args) = @$_;
1011 1169
1012 $obj->attach ($name, %{$args || {} }); 1170 $obj->attach ($name, %{$args || {} });
1025 }, 1183 },
1026); 1184);
1027 1185
1028sub object_freezer_save { 1186sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1187 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1188
1033 sync_job { 1189 sync_job {
1034 if (length $$rdata) { 1190 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1191 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1038 1194
1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1040 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1042 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1043 close $fh; 1202 aio_close $fh;
1044 1203
1045 if (@$objs) { 1204 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1051 close $fh; 1213 aio_close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1215 }
1054 } else { 1216 } else {
1055 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1056 } 1218 }
1057 1219
1058 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1059 } else { 1224 } else {
1060 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1061 } 1226 }
1062 } else { 1227 } else {
1063 aio_unlink $filename; 1228 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1065 } 1230 }
1066 }; 1231 };
1067
1068 undef $guard;
1069} 1232}
1070 1233
1071sub object_freezer_as_string { 1234sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1235 my ($rdata, $objs) = @_;
1073 1236
1078 1241
1079sub object_thawer_load { 1242sub object_thawer_load {
1080 my ($filename) = @_; 1243 my ($filename) = @_;
1081 1244
1082 my ($data, $av); 1245 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1246
1086 (aio_load $filename, $data) >= 0 1247 (aio_load $filename, $data) >= 0
1087 or return; 1248 or return;
1088 1249
1089 unless (aio_stat "$filename.pst") { 1250 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1251 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1252 or return;
1092 1253
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1254 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs};
1095 } 1256 }
1096 1257
1097 utf8::decode (my $decname = $filename); 1258 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1259 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1260 $decname, length $data, scalar @{$av || []};
1160 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1161 1322
1162 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1163} 1324}
1164 1325
1326use File::Glob ();
1327
1165cf::player->attach ( 1328cf::player->attach (
1166 on_command => sub { 1329 on_unknown_command => sub {
1167 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1168 1331
1169 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1170 or return; 1333 or return;
1171 1334
1201 1364
1202 cf::override; 1365 cf::override;
1203 }, 1366 },
1204); 1367);
1205 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1206sub load_extensions { 1382sub load_extensions {
1207 cf::sync_job { 1383 cf::sync_job {
1208 my %todo; 1384 my %todo;
1209 1385
1210 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1229 1405
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1408
1233 $ext{source} = 1409 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1236 . $source 1412 . $source
1237 . "\n};\n1"; 1413 . "\n};\n1";
1238 1414
1239 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1240 } 1416 }
1241 1417
1418 my $pass = 0;
1242 my %done; 1419 my %done;
1243 while (%todo) { 1420 while (%todo) {
1244 my $progress; 1421 my $progress;
1245 1422
1423 ++$pass;
1424
1425 ext:
1246 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip 1428 next ext
1249 unless exists $done{$_}; 1429 unless exists $done{$_};
1250 } 1430 }
1251 1431
1252 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1253 1433
1254 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1255 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1256 : "$v->{base}: extension inactive.\n";
1257 1438
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1258 if (exists $v->{meta}{mandatory}) { 1440 if exists $v->{meta}{mandatory};
1259 warn $msg; 1441 } else {
1260 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1261 exit 1; 1443 push @EXTS, $v->{pkg};
1262 } 1444 $progress = 1;
1263 1445
1264 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1265 } 1448 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
1270 } 1449 }
1271 1450
1272 skip: 1451 unless ($progress) {
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1274 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1275 } 1459 }
1276 }; 1460 };
1277} 1461}
1278 1462
1279############################################################################# 1463#############################################################################
1280 1464
1281=back 1465=back
1282 1466
1283=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1284 1468
1285Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1286 1470
1287=cut 1471=cut
1288 1472
1289package cf::player; 1473package cf::player;
1290 1474
1333 1517
1334sub exists($) { 1518sub exists($) {
1335 my ($login) = @_; 1519 my ($login) = @_;
1336 1520
1337 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1339} 1523}
1340 1524
1341sub find($) { 1525sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1527 my $login = $_[0];
1355 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1540 or return;
1357 1541
1358 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1359 or return; 1543 or return;
1544
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1363 } 1548 }
1364 } 1549 }
1365} 1550}
1366 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1367sub save($) { 1565sub save($) {
1368 my ($pl) = @_; 1566 my ($pl) = @_;
1369 1567
1370 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1371 1569
1374 1572
1375 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1376 1574
1377 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379 1582
1380 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1584 cf::cede_to_tick;
1382} 1585}
1383 1586
1415 my ($pl) = @_; 1618 my ($pl) = @_;
1416 1619
1417 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1418 1621
1419 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1624
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1426 1631
1427 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1672
1468 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1469 my $path = path $login; 1674 my $path = path $login;
1470 1675
1471 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1682 }
1477 1683
1508 } 1714 }
1509 1715
1510 \@paths 1716 \@paths
1511} 1717}
1512 1718
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1720
1515Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1722
1564=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1565 1724
1566Sends an ext reply to the player. 1725Sends an ext reply to the player.
1567 1726
1634our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1636 1795
1637sub generate_random_map { 1796sub generate_random_map {
1638 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1639 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1802 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 1927
1766# the temporary/swap location 1928# the temporary/swap location
1767sub save_path { 1929sub save_path {
1768 my ($self) = @_; 1930 my ($self) = @_;
1769 1931
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1772} 1934}
1773 1935
1774# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1775sub uniq_path { 1937sub uniq_path {
1776 my ($self) = @_; 1938 my ($self) = @_;
1777 1939
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1942}
1790 1943
1791sub decay_objects { 1944sub decay_objects {
1792 my ($self) = @_; 1945 my ($self) = @_;
1793 1946
1877sub find { 2030sub find {
1878 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1879 2032
1880 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1881 2034
1882 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2037
1885 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1890 or return; 2040 or return;
1891 2041
1892 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1893 2043
1895 or return; 2045 or return;
1896 2046
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1900 undef $guard1; 2051 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2052 $map->reset;
1903 return find $path; 2053 return find $path;
1904 } 2054 }
1905 2055
1906 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1907 } 2057 }
1908} 2058}
1909 2059
1910sub pre_load { } 2060sub pre_load { }
1911sub post_load { } 2061#sub post_load { } # XS
1912 2062
1913sub load { 2063sub load {
1914 my ($self) = @_; 2064 my ($self) = @_;
1915 2065
1916 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2084 $f->skip_block;
1935 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
1936 or return; 2086 or return;
1937 2087
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
1939 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1940 2090
1941 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2092 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2112 $self->decay_objects;
1963 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1964 $self->update_buttons; 2114 $self->update_buttons;
1965 cf::cede_to_tick; 2115 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2116 $self->activate;
1969 } 2117 }
1970 2118
1971 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1973 2121
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2123 }
1976 2124
1977 $self->post_load; 2125 $self->post_load;
1978} 2126}
1979 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
1980sub customise_for { 2131sub customise_for {
1981 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
1982 2133
1983 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2135 if $self->per_player;
2037 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2038 2189
2039 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2040 2191
2041 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2194 }
2044 2195
2045 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2046 2197
2047 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2199 $Coro::current->{desc} = "map prefetcher";
2200
2048 while (%MAP_PREFETCH) { 2201 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2202 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2203 if (my $map = find $k) {
2051 $map->load if $v; 2204 $map->load if $v;
2052 } 2205 }
2059 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2060 2213
2061 () 2214 ()
2062} 2215}
2063 2216
2217# common code, used by both ->save and ->swapout
2064sub save { 2218sub _save {
2065 my ($self) = @_; 2219 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2220
2069 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2070 2222
2071 return unless $self->dirty; 2223 return unless $self->dirty;
2072 2224
2078 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2079 2231
2080 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
2081 2233
2082 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2084 }; 2237 };
2238
2239 cf::get_slot 0.02;
2085 2240
2086 if ($uniq) { 2241 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2244 } else {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091 } 2246 }
2092} 2247}
2093 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2094sub swap_out { 2257sub swap_out {
2095 my ($self) = @_; 2258 my ($self) = @_;
2096 2259
2097 # save first because save cedes
2098 $self->save;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2261
2262 return if $self->in_memory != cf::MAP_ACTIVE;
2263 return if $self->{deny_save};
2102 return if $self->players; 2264 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2104 return if $self->{deny_save};
2105 2265
2106 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2107
2108 $self->deactivate; 2267 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2110 $self->clear; 2275 $self->clear;
2111} 2276}
2112 2277
2113sub reset_at { 2278sub reset_at {
2114 my ($self) = @_; 2279 my ($self) = @_;
2133 2298
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2300
2136 return if $self->players; 2301 return if $self->players;
2137 2302
2138 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2139 2304
2140 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2141 2306
2142 # need to save uniques path 2307 # need to save uniques path
2143 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
2226 2391
2227sub unique_maps() { 2392sub unique_maps() {
2228 [ 2393 [
2229 map { 2394 map {
2230 utf8::decode $_; 2395 utf8::decode $_;
2231 /\.map$/ 2396 s/\.map$//; # TODO future compatibility hack
2397 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2398 ? ()
2232 ? normalise $_ 2399 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2401 ]
2236} 2402}
2237 2403
2238package cf; 2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2239 2435
2240=back 2436=back
2241 2437
2242=head3 cf::object 2438=head3 cf::object
2243 2439
2247 2443
2248=over 4 2444=over 4
2249 2445
2250=item $ob->inv_recursive 2446=item $ob->inv_recursive
2251 2447
2252Returns the inventory of the object _and_ their inventories, recursively. 2448Returns the inventory of the object I<and> their inventories, recursively,
2449but I<not> the object itself.
2253 2450
2254=cut 2451=cut
2255 2452
2256sub inv_recursive_; 2453sub inv_recursive_;
2257sub inv_recursive_ { 2454sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2459 inv_recursive_ inv $_[0]
2263} 2460}
2264 2461
2265=item $ref = $ob->ref 2462=item $ref = $ob->ref
2266 2463
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2464Creates and returns a persistent reference to an object that can be stored as a string.
2268 2465
2269=item $ob = cf::object::deref ($refstring) 2466=item $ob = cf::object::deref ($refstring)
2270 2467
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2468returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2469even if the object actually exists. May block.
2274=cut 2471=cut
2275 2472
2276sub deref { 2473sub deref {
2277 my ($ref) = @_; 2474 my ($ref) = @_;
2278 2475
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2476 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2477 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2478 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2479 or return;
2286 $pl->ob->uuid eq $uuid 2480 $pl->ob->uuid eq $uuid
2287 or return; 2481 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2501can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2502dialogue with the given NPC character.
2309 2503
2310=cut 2504=cut
2311 2505
2506our $SAY_CHANNEL = {
2507 id => "say",
2508 title => "Map",
2509 reply => "say ",
2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2511};
2512
2513our $CHAT_CHANNEL = {
2514 id => "chat",
2515 title => "Chat",
2516 reply => "chat ",
2517 tooltip => "Player chat and shouts, global to the server.",
2518};
2519
2312# rough implementation of a future "reply" method that works 2520# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2521# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2522#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2523sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2524 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2535 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2536 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2537
2330 } else { 2538 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2539 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2540 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2541 }
2334 } 2542 }
2335} 2543}
2336 2544
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2545=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2570
2363=item $player_object->enter_link 2571=item $player_object->enter_link
2364 2572
2365Freezes the player and moves him/her to a special map (C<{link}>). 2573Freezes the player and moves him/her to a special map (C<{link}>).
2366 2574
2367The player should be reasonably safe there for short amounts of time. You 2575The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2576for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link
2578map.
2369 2579
2370Will never block. 2580Will never block.
2371 2581
2372=item $player_object->leave_link ($map, $x, $y) 2582=item $player_object->leave_link ($map, $x, $y)
2373 2583
2425 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2427 2637
2428 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2431 2641
2432 $map->load; 2642 $map->load;
2433 $map->load_neighbours; 2643 $map->load_neighbours;
2434 2644
2435 return unless $self->contr->active; 2645 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2646
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2440} 2652}
2441 2653
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2655
2444Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2657her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2658that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2659the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2660be called at the end of this process.
2449 2661
2662Note that $check will be called with a potentially non-loaded map, so if
2663it needs a loaded map it has to call C<< ->load >>.
2664
2450=cut 2665=cut
2451 2666
2452our $GOTOGEN; 2667our $GOTOGEN;
2453 2668
2454sub cf::object::player::goto { 2669sub cf::object::player::goto {
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2673 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2674
2460 $self->enter_link; 2675 $self->enter_link;
2461 2676
2462 (async { 2677 (async {
2678 $Coro::current->{desc} = "player::goto $path $x $y";
2679
2463 # *tag paths override both path and x|y 2680 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2681 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2682 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2683 my $ob = $obs[rand @obs];
2467 2684
2530} 2747}
2531 2748
2532sub prepare_random_map { 2749sub prepare_random_map {
2533 my ($exit) = @_; 2750 my ($exit) = @_;
2534 2751
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2752 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2753 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2754 # that depends on the exit object
2540 2755
2541 my $rmp = parse_random_map_params $exit->msg; 2756 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2758 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2759 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2760 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2761 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2762 $rmp->{origin_y} = $exit->y;
2763
2764 $exit->map->touch;
2548 } 2765 }
2549 2766
2550 $rmp->{random_seed} ||= $exit->random_seed; 2767 $rmp->{random_seed} ||= $exit->random_seed;
2551 2768
2552 my $data = cf::to_json $rmp; 2769 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2770 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2771 my $meta = "$RANDOMDIR/$md5.meta";
2555 2772
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2773 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2774 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2775 undef $fh;
2559 aio_rename "$meta~", $meta; 2776 aio_rename "$meta~", $meta;
2560 2777
2778 my $slaying = "?random/$md5";
2779
2780 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2781 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2782 $exit->msg (undef);
2783 }
2563 } 2784 }
2564} 2785}
2565 2786
2566sub cf::object::player::enter_exit { 2787sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2788 my ($self, $exit) = @_;
2568 2789
2569 return unless $self->type == cf::PLAYER; 2790 return unless $self->type == cf::PLAYER;
2570 2791
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2792 $self->enter_link;
2583 2793
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2794 (async {
2589 $self->deactivate_recursive; # just to be sure 2795 $Coro::current->{desc} = "enter_exit";
2796
2590 unless (eval { 2797 unless (eval {
2798 $self->deactivate_recursive; # just to be sure
2799
2800 # random map handling
2801 {
2802 my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804 prepare_random_map $exit
2805 if $exit->slaying eq "/!";
2806 }
2807
2808 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2809 my $x = $exit->stats->hp;
2810 my $y = $exit->stats->sp;
2811
2591 $self->goto ($slaying, $hp, $sp); 2812 $self->goto ($map, $x, $y);
2592 2813
2814 # if exit is damned, update players death & WoR home-position
2815 $self->contr->savebed ($map, $x, $y)
2816 if $exit->flag (cf::FLAG_DAMNED);
2817
2593 1; 2818 1
2594 }) { 2819 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2820 $self->message ("Something went wrong deep within the deliantra server. "
2596 . "I'll try to bring you back to the map you were before. " 2821 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2822 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2823 cf::NDI_UNIQUE | cf::NDI_RED);
2599 2824
2600 warn "ERROR in enter_exit: $@"; 2825 warn "ERROR in enter_exit: $@";
2617sub cf::client::send_drawinfo { 2842sub cf::client::send_drawinfo {
2618 my ($self, $text, $flags) = @_; 2843 my ($self, $text, $flags) = @_;
2619 2844
2620 utf8::encode $text; 2845 utf8::encode $text;
2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847}
2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2622} 2872}
2623 2873
2624=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2625 2875
2626Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2878the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2879the message unless the client supports the msg packet.
2630 2880
2631=cut 2881=cut
2632 2882
2883# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2634 "c/identify" => { 2891 "c/identify" => {
2635 id => "identify", 2892 id => "infobox",
2636 title => "Identify", 2893 title => "Identify",
2637 reply => undef, 2894 reply => undef,
2638 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
2639 }, 2896 },
2640 "c/examine" => { 2897 "c/examine" => {
2641 id => "examine", 2898 id => "infobox",
2642 title => "Examine", 2899 title => "Examine",
2643 reply => undef, 2900 reply => undef,
2644 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2645 }, 2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2908 },
2909 "c/book" => {
2910 id => "infobox",
2911 title => "Book",
2912 reply => undef,
2913 tooltip => "The contents of a note or book",
2914 },
2915 "c/lookat" => {
2916 id => "infobox",
2917 title => "Look",
2918 reply => undef,
2919 tooltip => "What you saw there",
2920 },
2921 "c/who" => {
2922 id => "infobox",
2923 title => "Players",
2924 reply => undef,
2925 tooltip => "Shows players who are currently online",
2926 },
2927 "c/body" => {
2928 id => "infobox",
2929 title => "Body Parts",
2930 reply => undef,
2931 tooltip => "Shows which body parts you posess and are available",
2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2939 "c/skills" => {
2940 id => "infobox",
2941 title => "Skills",
2942 reply => undef,
2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2968 },
2969 "c/uptime" => {
2970 id => "infobox",
2971 title => "Uptime",
2972 reply => undef,
2973 tooltip => "How long the server has been running since last restart",
2974 },
2975 "c/mapinfo" => {
2976 id => "infobox",
2977 title => "Map Info",
2978 reply => undef,
2979 tooltip => "Information related to the maps",
2980 },
2981 "c/party" => {
2982 id => "party",
2983 title => "Party",
2984 reply => "gsay ",
2985 tooltip => "Messages and chat related to your party",
2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2646); 2995);
2647 2996
2648sub cf::client::send_msg { 2997sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2999
2651 $msg = $self->pl->expand_cfpod ($msg); 3000 $msg = $self->pl->expand_cfpod ($msg)
3001 unless $color & cf::NDI_VERBATIM;
2652 3002
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 3003 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 3004
2655 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3006 if ($CHANNEL{$channel}) {
3007 $channel = $CHANNEL{$channel};
2657 3008
3009 $self->ext_msg (channel_info => $channel);
3010 $channel = $channel->{id};
3011
2658 if (ref $channel) { 3012 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2663 if $self->can_msg;
2664 } 3017 }
2665 3018
2666 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2667 } 3020 }
2668 3021
2669 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2670 3023
2671 if ($self->can_msg) {
2672 # default colour, mask it out 3024 # default colour, mask it out
2673 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2675 3027
2676 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3028 my $pkt = "msg "
3029 . $self->{json_coder}->encode (
2677 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2678 } else { 3031 );
2679 if ($color >= 0) {
2680 # replace some tags by gcfclient-compatible ones
2681 for ($msg) {
2682 1 while
2683 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688 }
2689 3032
2690 $color &= cf::NDI_COLOR_MASK; 3033 $self->send_big_packet ($pkt);
2691
2692 utf8::encode $msg;
2693
2694 if (0 && $msg =~ /\[/) {
2695 # COMMAND/INFO
2696 $self->send_packet ("drawextinfo $color 10 8 $msg")
2697 } else {
2698 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699 $self->send_packet ("drawinfo $color $msg")
2700 }
2701 }
2702 }
2703} 3034}
2704 3035
2705=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2706 3037
2707Sends an ext event to the client. 3038Sends an ext event to the client.
2710 3041
2711sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2712 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2713 3044
2714 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2716 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2717 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 } 3050 }
2720} 3051}
2721 3052
2722=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2723 3054
2727 3058
2728sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2730 3061
2731 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove 3065 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2737 } 3068 }
2738} 3069}
2739 3070
2740=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2741 3072
2842 3173
2843 $coro 3174 $coro
2844} 3175}
2845 3176
2846cf::client->attach ( 3177cf::client->attach (
2847 on_destroy => sub { 3178 on_client_destroy => sub {
2848 my ($ns) = @_; 3179 my ($ns) = @_;
2849 3180
2850 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2851 }, 3182 },
2852); 3183);
2868our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
2869 3200
2870$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
2871 3202
2872$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
2873 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
2874 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
2875 sort time 3206 sort time
2876)); 3207));
2877 3208
2878# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
2880=pod 3211=pod
2881 3212
2882The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
2883 3214
2884 cf::object 3215 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3216 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3217 insert remove name archname title slaying race decrease split
3218 value
2887 3219
2888 cf::object::player 3220 cf::object::player
2889 player 3221 player
2890 3222
2891 cf::player 3223 cf::player
2896 3228
2897=cut 3229=cut
2898 3230
2899for ( 3231for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
2902 decrease_ob_nr)], 3234 decrease split destroy change_exp value msg lore send_msg)],
2903 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
2905 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
2906) { 3238) {
2907 no strict 'refs'; 3239 no strict 'refs';
2908 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
2909 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2927 3259
2928 my $qcode = $code; 3260 my $qcode = $code;
2929 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2930 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
2931 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
2932 local $_; 3267 local $_;
2933 local @safe::cf::_safe_eval_args = values %vars;
2934 3268
2935 my $eval = 3269 my $eval =
2936 "do {\n" 3270 "do {\n"
2937 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2938 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
2939 . $code 3273 . $code
2940 . "\n}" 3274 . "\n}"
2941 ; 3275 ;
2942 3276
3277 if ($CFG{safe_eval}) {
2943 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
2944 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2945 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
2946 3286
2947 if ($@) { 3287 if ($@) {
2948 warn "$@"; 3288 warn "$@";
2949 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
2950 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
2969=cut 3309=cut
2970 3310
2971sub register_script_function { 3311sub register_script_function {
2972 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
2973 3313
2974 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
2975 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
2976} 3316}
2977 3317
2978=back 3318=back
2979 3319
2980=cut 3320=cut
3001 3341
3002 $facedata->{version} == 2 3342 $facedata->{version} == 2
3003 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3004 3344
3005 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3006 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3007 type => FT_RSRC, 3348 type => FT_RSRC,
3008 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3009 }; 3351 };
3010 cf::cede_to_tick; 3352 cf::cede_to_tick;
3011 3353
3012 { 3354 {
3013 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
3014 3356
3015 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3359
3017 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3021 3364
3022 cf::cede_to_tick; 3365 cf::cede_to_tick;
3023 } 3366 }
3024 3367
3025 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3369 next unless $info->{smooth};
3370
3027 my $idx = cf::face::find $face 3371 my $idx = cf::face::find $face
3028 or next; 3372 or next;
3373
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3374 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3375 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3376 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3377 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3378 warn "smooth face '$info->{smooth}' not found for face '$face'";
3047 3392
3048 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3049 } 3394 }
3050 3395
3051 { 3396 {
3052 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3055 3398
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3400 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data;
3061 3402
3062 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3063 # prepend meta info 3404 cf::face::set_type $idx, $info->{type};
3064
3065 my $meta = $enc->encode ({
3066 name => $name,
3067 %{ $info->{meta} || {} },
3068 });
3069
3070 $data = pack "(w/a*)*", $meta, $info->{data};
3071 } else { 3405 } else {
3072 $data = $info->{data}; 3406 $RESOURCE{$name} = $info;
3073 } 3407 }
3074 3408
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3409 cf::cede_to_tick;
3079 } 3410 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3411 }
3412
3413 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3414
3100 1 3415 1
3101} 3416}
3417
3418cf::global->attach (on_resource_update => sub {
3419 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423 my $sound = $soundconf->{compat}[$_]
3424 or next;
3425
3426 my $face = cf::face::find "sound/$sound->[1]";
3427 cf::sound::set $sound->[0] => $face;
3428 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429 }
3430
3431 while (my ($k, $v) = each %{$soundconf->{event}}) {
3432 my $face = cf::face::find "sound/$v";
3433 cf::sound::set $k => $face;
3434 }
3435 }
3436});
3102 3437
3103register_exticmd fx_want => sub { 3438register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3439 my ($ns, $want) = @_;
3105 3440
3106 while (my ($k, $v) = each %$want) { 3441 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v); 3442 $ns->fx_want ($k, $v);
3108 } 3443 }
3109}; 3444};
3445
3446sub load_resource_file($) {
3447 my $guard = lock_acquire "load_resource_file";
3448
3449 my $status = load_resource_file_ $_[0];
3450 get_slot 0.1, 100;
3451 cf::arch::commit_load;
3452
3453 $status
3454}
3110 3455
3111sub reload_regions { 3456sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework 3457 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?) 3458 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = (); 3459 %ext::player_env::MUSIC_FACE_CACHE = ();
3128} 3473}
3129 3474
3130sub reload_archetypes { 3475sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes" 3476 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n"; 3477 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138} 3478}
3139 3479
3140sub reload_treasures { 3480sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures" 3481 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n"; 3482 or die "unable to load treasurelists\n";
3143} 3483}
3144 3484
3145sub reload_resources { 3485sub reload_resources {
3146 warn "reloading resource files...\n"; 3486 warn "reloading resource files...\n";
3147 3487
3488 reload_facedata;
3489 reload_archetypes;
3148 reload_regions; 3490 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures; 3491 reload_treasures;
3153 3492
3154 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3155} 3494}
3156 3495
3157sub init {
3158 reload_resources;
3159}
3160
3161sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3500 or return;
3164 3501
3165 local $/; 3502 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3167 3504
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3506
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3175 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3176 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3177 }; 3514 };
3178 warn $@ if $@; 3515 warn $@ if $@;
3179 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3519}
3520
3521sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!";
3524 flock $fh, &Fcntl::LOCK_EX
3525 or die "$PIDFILE: flock: $!";
3526 $fh
3527}
3528
3529# make sure only one server instance is running at any one time
3530sub atomic {
3531 my $fh = pidfile;
3532
3533 my $pid = <$fh>;
3534 kill 9, $pid if $pid > 0;
3535
3536 seek $fh, 0, 0;
3537 print $fh $$;
3538}
3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3180} 3547}
3181 3548
3182sub main { 3549sub main {
3550 cf::init_globals; # initialise logging
3551
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558
3183 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3561 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3562 (async {
3187 Event::one_event; 3563 $Coro::current->{desc} = "IDLE BUG HANDLER";
3564 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3565 })->prio (Coro::PRIO_MAX);
3189 }; 3566 };
3190 3567
3568 evthread_start IO::AIO::poll_fileno;
3569
3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3579 reload_resources;
3191 reload_config; 3580 reload_config;
3192 db_init; 3581 db_init;
3582
3583 cf::init_uuid;
3584 cf::init_signals;
3585 cf::init_skills;
3586
3587 cf::init_beforeplay;
3588
3589 atomic;
3590
3193 load_extensions; 3591 load_extensions;
3194 3592
3195 $TICK_WATCHER->start; 3593 utime time, time, $RUNTIMEFILE;
3196 Event::loop; 3594
3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598
3599 (pop @POST_INIT)->(0) while @POST_INIT;
3600 };
3601
3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3197} 3606}
3198 3607
3199############################################################################# 3608#############################################################################
3200# initialisation and cleanup 3609# initialisation and cleanup
3201 3610
3202# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3203BEGIN { 3612BEGIN {
3613 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3212 },
3213 ); 3617 };
3214 } 3618 }
3215} 3619}
3216 3620
3217sub write_runtime { 3621sub write_runtime_sync {
3218 my $runtime = "$LOCALDIR/runtime"; 3622 my $t0 = AE::time;
3219 3623
3220 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3222 3626
3223 IO::AIO::aio_utime $runtime, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3224 3628
3225 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3226 3630
3227 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3228 or return; 3632 or return;
3229 3633
3230 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3231 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3232 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
3242 aio_utime $fh, undef, undef; 3646 aio_utime $fh, undef, undef;
3243 3647
3244 close $fh 3648 close $fh
3245 or return; 3649 or return;
3246 3650
3247 aio_rename "$runtime~", $runtime 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3248 and return; 3652 and return;
3249 3653
3250 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3251 3655
3252 1 3656 1
3657}
3658
3659our $uuid_lock;
3660our $uuid_skip;
3661
3662sub write_uuid_sync($) {
3663 $uuid_skip ||= $_[0];
3664
3665 return if $uuid_lock;
3666 local $uuid_lock = 1;
3667
3668 my $uuid = "$LOCALDIR/uuid";
3669
3670 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3671 or return;
3672
3673 my $value = uuid_seq uuid_cur;
3674
3675 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n";
3677 return;
3678 }
3679
3680 my $value = uuid_str $value + $uuid_skip;
3681 $uuid_skip = 0;
3682
3683 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3684 and return;
3685
3686 # always fsync - this file is important
3687 aio_fsync $fh
3688 and return;
3689
3690 close $fh
3691 or return;
3692
3693 aio_rename "$uuid~", $uuid
3694 and return;
3695
3696 warn "uuid file written ($value).\n";
3697
3698 1
3699
3700}
3701
3702sub write_uuid($$) {
3703 my ($skip, $sync) = @_;
3704
3705 $sync ? write_uuid_sync $skip
3706 : async { write_uuid_sync $skip };
3253} 3707}
3254 3708
3255sub emergency_save() { 3709sub emergency_save() {
3256 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3257 3711
3258 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3259 3713
3260 cf::sync_job { 3714 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3261 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3262 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3263 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3265 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3726 $pl->valid or next;
3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3728 $pl->save;
3269 } 3729 }
3270 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3271 3731
3272 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3273 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3274 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3275 $map->valid or next; 3735 $map->valid or next;
3276 $map->save; 3736 $map->save;
3277 } 3737 }
3278 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3279 3739
3280 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n"; 3742 warn "emergency_perl_save: end database checkpoint\n";
3743
3744 warn "emergency_perl_save: begin write uuid\n";
3745 write_uuid_sync 1;
3746 warn "emergency_perl_save: end write uuid\n";
3283 }; 3747 };
3284 3748
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3285 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3286} 3755}
3287 3756
3288sub post_cleanup { 3757sub post_cleanup {
3289 my ($make_core) = @_; 3758 my ($make_core) = @_;
3290 3759
3291 warn Carp::longmess "post_cleanup backtrace" 3760 warn Carp::longmess "post_cleanup backtrace"
3292 if $make_core; 3761 if $make_core;
3762
3763 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$;
3765}
3766
3767# a safer delete_package, copied from Symbol
3768sub clear_package($) {
3769 my $pkg = shift;
3770
3771 # expand to full symbol table name if needed
3772 unless ($pkg =~ /^main::.*::$/) {
3773 $pkg = "main$pkg" if $pkg =~ /^::/;
3774 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3775 $pkg .= '::' unless $pkg =~ /::$/;
3776 }
3777
3778 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3779 my $stem_symtab = *{$stem}{HASH};
3780
3781 defined $stem_symtab and exists $stem_symtab->{$leaf}
3782 or return;
3783
3784 # clear all symbols
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 }
3790 warn "cleared package $pkg\n";#d#
3293} 3791}
3294 3792
3295sub do_reload_perl() { 3793sub do_reload_perl() {
3296 # can/must only be called in main 3794 # can/must only be called in main
3297 if ($Coro::current != $Coro::main) { 3795 if ($Coro::current != $Coro::main) {
3298 warn "can only reload from main coroutine"; 3796 warn "can only reload from main coroutine";
3299 return; 3797 return;
3300 } 3798 }
3301 3799
3800 return if $RELOAD++;
3801
3802 my $t1 = AE::time;
3803
3804 while ($RELOAD) {
3302 warn "reloading..."; 3805 warn "reloading...";
3303 3806
3304 warn "entering sync_job"; 3807 warn "entering sync_job";
3305 3808
3306 cf::sync_job { 3809 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark 3810 cf::write_runtime_sync; # external watchdog should not bark
3308 cf::emergency_save; 3811 cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark 3812 cf::write_runtime_sync; # external watchdog should not bark
3310 3813
3311 warn "syncing database to disk"; 3814 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3815 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3816
3314 # if anything goes wrong in here, we should simply crash as we already saved 3817 # if anything goes wrong in here, we should simply crash as we already saved
3315 3818
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests"; 3819 warn "flushing outstanding aio requests";
3322 for (;;) {
3323 BDB::flush;
3324 IO::AIO::flush;
3325 Coro::cede;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3820 while (IO::AIO::nreqs || BDB::nreqs) {
3327 warn "iterate..."; 3821 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3328 }
3329
3330 ++$RELOAD;
3331
3332 warn "cancelling all extension coros";
3333 $_->cancel for values %EXT_CORO;
3334 %EXT_CORO = ();
3335
3336 warn "removing commands";
3337 %COMMAND = ();
3338
3339 warn "removing ext/exti commands";
3340 %EXTCMD = ();
3341 %EXTICMD = ();
3342
3343 warn "unloading/nuking all extensions";
3344 for my $pkg (@EXTS) {
3345 warn "... unloading $pkg";
3346
3347 if (my $cb = $pkg->can ("unload")) {
3348 eval {
3349 $cb->($pkg);
3350 1
3351 } or warn "$pkg unloaded, but with errors: $@";
3352 } 3822 }
3353 3823
3354 warn "... nuking $pkg"; 3824 warn "cancelling all extension coros";
3355 Symbol::delete_package $pkg; 3825 $_->cancel for values %EXT_CORO;
3356 } 3826 %EXT_CORO = ();
3357 3827
3358 warn "unloading all perl modules loaded from $LIBDIR"; 3828 warn "removing commands";
3359 while (my ($k, $v) = each %INC) { 3829 %COMMAND = ();
3360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3361 3830
3831 warn "removing ext/exti commands";
3832 %EXTCMD = ();
3833 %EXTICMD = ();
3834
3835 warn "unloading/nuking all extensions";
3836 for my $pkg (@EXTS) {
3362 warn "... unloading $k"; 3837 warn "... unloading $pkg";
3363 delete $INC{$k};
3364 3838
3365 $k =~ s/\.pm$//;
3366 $k =~ s/\//::/g;
3367
3368 if (my $cb = $k->can ("unload_module")) { 3839 if (my $cb = $pkg->can ("unload")) {
3840 eval {
3369 $cb->(); 3841 $cb->($pkg);
3842 1
3843 } or warn "$pkg unloaded, but with errors: $@";
3844 }
3845
3846 warn "... clearing $pkg";
3847 clear_package $pkg;
3370 } 3848 }
3371 3849
3372 Symbol::delete_package $k; 3850 warn "unloading all perl modules loaded from $LIBDIR";
3851 while (my ($k, $v) = each %INC) {
3852 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853
3854 warn "... unloading $k";
3855 delete $INC{$k};
3856
3857 $k =~ s/\.pm$//;
3858 $k =~ s/\//::/g;
3859
3860 if (my $cb = $k->can ("unload_module")) {
3861 $cb->();
3862 }
3863
3864 clear_package $k;
3373 } 3865 }
3374 3866
3375 warn "getting rid of safe::, as good as possible"; 3867 warn "getting rid of safe::, as good as possible";
3376 Symbol::delete_package "safe::$_" 3868 clear_package "safe::$_"
3377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3378 3870
3379 warn "unloading cf.pm \"a bit\""; 3871 warn "unloading cf.pm \"a bit\"";
3380 delete $INC{"cf.pm"}; 3872 delete $INC{"cf.pm"};
3381 delete $INC{"cf/pod.pm"}; 3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3382 3874
3383 # don't, removes xs symbols, too, 3875 # don't, removes xs symbols, too,
3384 # and global variables created in xs 3876 # and global variables created in xs
3385 #Symbol::delete_package __PACKAGE__; 3877 #clear_package __PACKAGE__;
3386 3878
3387 warn "unload completed, starting to reload now"; 3879 warn "unload completed, starting to reload now";
3388 3880
3389 warn "reloading cf.pm"; 3881 warn "reloading cf.pm";
3390 require cf; 3882 require cf;
3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3883 cf::_connect_to_perl_1;
3392 3884
3393 warn "loading config and database again"; 3885 warn "loading config and database again";
3394 cf::reload_config; 3886 cf::reload_config;
3395 3887
3396 warn "loading extensions"; 3888 warn "loading extensions";
3397 cf::load_extensions; 3889 cf::load_extensions;
3398 3890
3891 if ($REATTACH_ON_RELOAD) {
3399 warn "reattaching attachments to objects/players"; 3892 warn "reattaching attachments to objects/players";
3400 _global_reattach; # objects, sockets 3893 _global_reattach; # objects, sockets
3401 warn "reattaching attachments to maps"; 3894 warn "reattaching attachments to maps";
3402 reattach $_ for values %MAP; 3895 reattach $_ for values %MAP;
3403 warn "reattaching attachments to players"; 3896 warn "reattaching attachments to players";
3404 reattach $_ for values %PLAYER; 3897 reattach $_ for values %PLAYER;
3898 }
3405 3899
3900 warn "running post_init jobs";
3901 (pop @POST_INIT)->(1) while @POST_INIT;
3902
3406 warn "leaving sync_job"; 3903 warn "leaving sync_job";
3407 3904
3408 1 3905 1
3409 } or do { 3906 } or do {
3410 warn $@; 3907 warn $@;
3411 warn "error while reloading, exiting."; 3908 cf::cleanup "error while reloading, exiting.";
3412 exit 1;
3413 }; 3909 };
3414 3910
3415 warn "reloaded"; 3911 warn "reloaded";
3912 --$RELOAD;
3913 }
3914
3915 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n";
3416}; 3917};
3417 3918
3418our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3419 3920
3420sub reload_perl() { 3921sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3922 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3423 3924
3424 $RELOAD_WATCHER ||= Event->timer ( 3925 $RELOAD_WATCHER ||= cf::async {
3425 reentrant => 0, 3926 Coro::AIO::aio_wait cache_extensions;
3426 after => 0, 3927
3427 data => WF_AUTOCANCEL, 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3428 cb => sub {
3429 do_reload_perl; 3929 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3431 }, 3931 };
3432 ); 3932 };
3433} 3933}
3434 3934
3435register_command "reload" => sub { 3935register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3936 my ($who, $arg) = @_;
3437 3937
3438 if ($who->flag (FLAG_WIZ)) { 3938 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3939 $who->message ("reloading server.");
3940 async {
3941 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3942 reload_perl;
3943 };
3441 } 3944 }
3442}; 3945};
3443 3946
3444unshift @INC, $LIBDIR; 3947unshift @INC, $LIBDIR;
3445 3948
3447 3950
3448our @WAIT_FOR_TICK; 3951our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 3952our @WAIT_FOR_TICK_BEGIN;
3450 3953
3451sub wait_for_tick { 3954sub wait_for_tick {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main; 3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3454 3956
3455 my $signal = new Coro::Signal; 3957 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 3958 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 3959 $signal->wait;
3458} 3960}
3459 3961
3460sub wait_for_tick_begin { 3962sub wait_for_tick_begin {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main; 3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3463 3964
3464 my $signal = new Coro::Signal; 3965 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3966 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3967 $signal->wait;
3467} 3968}
3468 3969
3469$TICK_WATCHER = Event->timer ( 3970sub tick {
3470 reentrant => 0,
3471 parked => 1,
3472 prio => 0,
3473 at => $NEXT_TICK || $TICK,
3474 data => WF_AUTOCANCEL,
3475 cb => sub {
3476 if ($Coro::current != $Coro::main) { 3971 if ($Coro::current != $Coro::main) {
3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3972 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478 unless ++$bug_warning > 10; 3973 unless ++$bug_warning > 10;
3479 return; 3974 return;
3480 } 3975 }
3481 3976
3482 $NOW = $tick_start = Event::time;
3483
3484 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3485 3978
3486 $RUNTIME += $TICK; 3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3487 $NEXT_TICK += $TICK;
3488 3980
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491 Coro::async_pool { 3983 Coro::async_pool {
3984 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3985 write_runtime_sync
3493 or warn "ERROR: unable to write runtime file: $!"; 3986 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 } 3987 };
3988 }
3496 3989
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3990 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 3991 $sig->send;
3499 } 3992 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 3993 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 3994 $sig->send;
3502 } 3995 }
3503 3996
3504 $NOW = Event::time; 3997 $LOAD = ($NOW - $TICK_START) / $TICK;
3505
3506 # if we are delayed by four ticks or more, skip them all
3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509 $TICK_WATCHER->at ($NEXT_TICK);
3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3998 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 3999
3515 _post_tick; 4000 if (0) {
4001 if ($NEXT_TICK) {
4002 my $jitter = $TICK_START - $NEXT_TICK;
4003 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004 warn "jitter $JITTER\n";#d#
4005 }
3516 }, 4006 }
3517); 4007}
3518 4008
3519{ 4009{
4010 # configure BDB
4011
3520 BDB::min_parallel 8; 4012 BDB::min_parallel 16;
3521 BDB::max_poll_time $TICK * 0.1; 4013 BDB::max_poll_reqs $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 4014 $AnyEvent::BDB::WATCHER->priority (1);
3523 reentrant => 0,
3524 fd => BDB::poll_fileno,
3525 poll => 'r',
3526 prio => 0,
3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530
3531 BDB::set_sync_prepare {
3532 my $status;
3533 my $current = $Coro::current;
3534 (
3535 sub {
3536 $status = $!;
3537 $current->ready; undef $current;
3538 },
3539 sub {
3540 Coro::schedule while defined $current;
3541 $! = $status;
3542 },
3543 )
3544 };
3545 4015
3546 unless ($DB_ENV) { 4016 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create; 4017 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4018 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3549 | BDB::LOG_AUTOREMOVE, 1); 4019 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4020 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3550 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4021 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3551 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4022 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3552 4023
3553 cf::sync_job { 4024 cf::sync_job {
3554 eval { 4025 eval {
3564 4035
3565 cf::cleanup "db_env_open(db): $@" if $@; 4036 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 4037 };
3567 } 4038 }
3568 4039
3569 $BDB_DEADLOCK_WATCHER = Event->timer ( 4040 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4041 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 },
3578 ); 4042 };
3579 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4043 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4044 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 ); 4045 };
3589 $BDB_TRICKLE_WATCHER = Event->timer ( 4046 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4047 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 ); 4048 };
3599} 4049}
3600 4050
3601{ 4051{
4052 # configure IO::AIO
4053
3602 IO::AIO::min_parallel 8; 4054 IO::AIO::min_parallel 8;
3603
3604 undef $Coro::AIO::WATCHER;
3605 IO::AIO::max_poll_time $TICK * 0.1; 4055 IO::AIO::max_poll_time $TICK * 0.1;
3606 $AIO_POLL_WATCHER = Event->io ( 4056 undef $AnyEvent::AIO::WATCHER;
3607 reentrant => 0,
3608 data => WF_AUTOCANCEL,
3609 fd => IO::AIO::poll_fileno,
3610 poll => 'r',
3611 prio => 6,
3612 cb => \&IO::AIO::poll_cb,
3613 );
3614} 4057}
3615 4058
3616my $_log_backtrace; 4059my $_log_backtrace;
3617 4060
3618sub _log_backtrace { 4061sub _log_backtrace {
3621 $msg =~ s/\n//; 4064 $msg =~ s/\n//;
3622 4065
3623 # limit the # of concurrent backtraces 4066 # limit the # of concurrent backtraces
3624 if ($_log_backtrace < 2) { 4067 if ($_log_backtrace < 2) {
3625 ++$_log_backtrace; 4068 ++$_log_backtrace;
4069 my $perl_bt = Carp::longmess $msg;
3626 async { 4070 async {
4071 $Coro::current->{desc} = "abt $msg";
4072
3627 my @bt = fork_call { 4073 my @bt = fork_call {
3628 @addr = map { sprintf "%x", $_ } @addr; 4074 @addr = map { sprintf "%x", $_ } @addr;
3629 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4075 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4076 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631 or die "addr2line: $!"; 4077 or die "addr2line: $!";
3639 } 4085 }
3640 4086
3641 @funcs 4087 @funcs
3642 }; 4088 };
3643 4089
3644 LOG llevInfo, "[ABT] $msg\n"; 4090 LOG llevInfo, "[ABT] $perl_bt\n";
4091 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3645 LOG llevInfo, "[ABT] $_\n" for @bt; 4092 LOG llevInfo, "[ABT] $_\n" for @bt;
3646 --$_log_backtrace; 4093 --$_log_backtrace;
3647 }; 4094 };
3648 } else { 4095 } else {
3649 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $msg\n";
3650 LOG llevInfo, "[ABT] [suppressed]\n"; 4097 LOG llevInfo, "[ABT] [suppressed]\n";
3651 } 4098 }
3652} 4099}
3653 4100
3654# load additional modules 4101# load additional modules
3655use cf::pod; 4102require "cf/$_.pm" for @EXTRA_MODULES;
4103cf::_connect_to_perl_2;
3656 4104
3657END { cf::emergency_save } 4105END { cf::emergency_save }
3658 4106
36591 41071
3660 4108

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines