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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.515 by root, Thu Apr 15 04:56:47 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];
… …
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1537 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1538
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 $f->next;
1359 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1360 or return; 1543 or return;
1544
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1364 } 1548 }
1365 } 1549 }
1366} 1550}
1367 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
1368sub save($) { 1565sub save($) {
1369 my ($pl) = @_; 1566 my ($pl) = @_;
1370 1567
1371 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1372 1569
… …
1375 1572
1376 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1377 1574
1378 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1379 $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];
1380 1582
1381 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1382 cf::cede_to_tick; 1584 cf::cede_to_tick;
1383} 1585}
1384 1586
… …
1416 my ($pl) = @_; 1618 my ($pl) = @_;
1417 1619
1418 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1419 1621
1420 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1421 $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
1422 1624
1423 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1424 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1425 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1426 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1427 1631
1428 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1429 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1468 1672
1469 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1470 my $path = path $login; 1674 my $path = path $login;
1471 1675
1472 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1475 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1476 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 } 1682 }
1478 1683
… …
1509 } 1714 }
1510 1715
1511 \@paths 1716 \@paths
1512} 1717}
1513 1718
1514=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1515 1720
1516Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1517
1518=cut
1519
1520sub expand_cfpod {
1521 ((my $self), (local $_)) = @_;
1522
1523 # escape & and <
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526
1527 # this is buggy, it needs to properly take care of nested <'s
1528
1529 1 while
1530 # replace B<>, I<>, U<> etc.
1531 s/B<([^\>]*)>/<b>$1<\/b>/
1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1535 # replace G<male|female> tags
1536 || s{G<([^>|]*)\|([^>]*)>}{
1537 $self->gender ? $2 : $1
1538 }ge
1539 # replace H<hint text>
1540 || s{H<([^\>]*)>}
1541 {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "")
1545 [$self->{hintmode}]
1546 }ge;
1547
1548 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g;
1550
1551 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines
1556
1557 $_
1558}
1559
1560sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode}
1563}
1564 1722
1565=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1566 1724
1567Sends an ext reply to the player. 1725Sends an ext reply to the player.
1568 1726
… …
1635our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1636our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1637 1795
1638sub generate_random_map { 1796sub generate_random_map {
1639 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
1640 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1641 $self->_create_random_map ( 1802 $self->_create_random_map (
1642 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1643 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1644 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1645 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1646 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1647 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1648 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1766 1927
1767# the temporary/swap location 1928# the temporary/swap location
1768sub save_path { 1929sub save_path {
1769 my ($self) = @_; 1930 my ($self) = @_;
1770 1931
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1773} 1934}
1774 1935
1775# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1776sub uniq_path { 1937sub uniq_path {
1777 my ($self) = @_; 1938 my ($self) = @_;
1778 1939
1779 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1780 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1781}
1782
1783# and all this just because we cannot iterate over
1784# all maps in C++...
1785sub change_all_map_light {
1786 my ($change) = @_;
1787
1788 $_->change_map_light ($change)
1789 for grep $_->outdoor, values %cf::MAP;
1790} 1942}
1791 1943
1792sub decay_objects { 1944sub decay_objects {
1793 my ($self) = @_; 1945 my ($self) = @_;
1794 1946
… …
1878sub find { 2030sub find {
1879 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1880 2032
1881 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1882 2034
1883 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1884 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1885 2037
1886 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1890 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1891 or return; 2040 or return;
1892 2041
1893 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1894 2043
… …
1896 or return; 2045 or return;
1897 2046
1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1899 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1900 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1901 undef $guard1; 2051 undef $guard1;
1902 undef $guard2;
1903 $map->reset; 2052 $map->reset;
1904 return find $path; 2053 return find $path;
1905 } 2054 }
1906 2055
1907 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1908 } 2057 }
1909} 2058}
1910 2059
1911sub pre_load { } 2060sub pre_load { }
1912sub post_load { } 2061#sub post_load { } # XS
1913 2062
1914sub load { 2063sub load {
1915 my ($self) = @_; 2064 my ($self) = @_;
1916 2065
1917 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
… …
1934 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block; 2084 $f->skip_block;
1936 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
1937 or return; 2086 or return;
1938 2087
1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
1940 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1941 2090
1942 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1943 utf8::encode $uniq; 2092 utf8::encode $uniq;
1944 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
… …
1962 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1963 $self->decay_objects; 2112 $self->decay_objects;
1964 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1965 $self->update_buttons; 2114 $self->update_buttons;
1966 cf::cede_to_tick; 2115 cf::cede_to_tick;
1967 $self->set_darkness_map;
1968 cf::cede_to_tick;
1969 $self->activate; 2116 $self->activate;
1970 } 2117 }
1971 2118
1972 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1974 2121
1975 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1976 } 2123 }
1977 2124
1978 $self->post_load; 2125 $self->post_load;
1979} 2126}
1980 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
1981sub customise_for { 2131sub customise_for {
1982 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
1983 2133
1984 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
1985 if $self->per_player; 2135 if $self->per_player;
… …
2038 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2039 2189
2040 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2041 2191
2042 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2044 } 2194 }
2045 2195
2046 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2047 2197
2048 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2199 $Coro::current->{desc} = "map prefetcher";
2200
2049 while (%MAP_PREFETCH) { 2201 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2202 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2203 if (my $map = find $k) {
2052 $map->load if $v; 2204 $map->load if $v;
2053 } 2205 }
… …
2079 return if $self->{deny_save}; 2231 return if $self->{deny_save};
2080 2232
2081 local $self->{last_access} = $self->last_access;#d# 2233 local $self->{last_access} = $self->last_access;#d#
2082 2234
2083 cf::async { 2235 cf::async {
2236 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2237 $_->contr->save for $self->players;
2085 }; 2238 };
2239
2240 cf::get_slot 0.02;
2086 2241
2087 if ($uniq) { 2242 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2244 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2245 } else {
… …
2099 $self->save; 2254 $self->save;
2100 2255
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2257
2103 return if $self->players; 2258 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2259 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2260 return if $self->{deny_save};
2106 2261
2107 $self->in_memory (cf::MAP_SWAPPED); 2262 $self->in_memory (cf::MAP_SWAPPED);
2108 2263
2109 $self->deactivate; 2264 $self->deactivate;
… …
2134 2289
2135 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2136 2291
2137 return if $self->players; 2292 return if $self->players;
2138 2293
2139 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2140 2295
2141 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2142 2297
2143 # need to save uniques path 2298 # need to save uniques path
2144 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
… …
2227 2382
2228sub unique_maps() { 2383sub unique_maps() {
2229 [ 2384 [
2230 map { 2385 map {
2231 utf8::decode $_; 2386 utf8::decode $_;
2232 /\.map$/ 2387 s/\.map$//; # TODO future compatibility hack
2388 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2389 ? ()
2233 ? normalise $_ 2390 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2392 ]
2237} 2393}
2238 2394
2239package cf; 2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2240 2426
2241=back 2427=back
2242 2428
2243=head3 cf::object 2429=head3 cf::object
2244 2430
… …
2248 2434
2249=over 4 2435=over 4
2250 2436
2251=item $ob->inv_recursive 2437=item $ob->inv_recursive
2252 2438
2253Returns the inventory of the object _and_ their inventories, recursively. 2439Returns the inventory of the object I<and> their inventories, recursively,
2440but I<not> the object itself.
2254 2441
2255=cut 2442=cut
2256 2443
2257sub inv_recursive_; 2444sub inv_recursive_;
2258sub inv_recursive_ { 2445sub inv_recursive_ {
… …
2263 inv_recursive_ inv $_[0] 2450 inv_recursive_ inv $_[0]
2264} 2451}
2265 2452
2266=item $ref = $ob->ref 2453=item $ref = $ob->ref
2267 2454
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2455Creates and returns a persistent reference to an object that can be stored as a string.
2269 2456
2270=item $ob = cf::object::deref ($refstring) 2457=item $ob = cf::object::deref ($refstring)
2271 2458
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2459returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2460even if the object actually exists. May block.
… …
2275=cut 2462=cut
2276 2463
2277sub deref { 2464sub deref {
2278 my ($ref) = @_; 2465 my ($ref) = @_;
2279 2466
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2467 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2468 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2469 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2470 or return;
2287 $pl->ob->uuid eq $uuid 2471 $pl->ob->uuid eq $uuid
2288 or return; 2472 or return;
… …
2308can be C<undef>. Does the right thing when the player is currently in a 2492can be C<undef>. Does the right thing when the player is currently in a
2309dialogue with the given NPC character. 2493dialogue with the given NPC character.
2310 2494
2311=cut 2495=cut
2312 2496
2497our $SAY_CHANNEL = {
2498 id => "say",
2499 title => "Map",
2500 reply => "say ",
2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2502};
2503
2504our $CHAT_CHANNEL = {
2505 id => "chat",
2506 title => "Chat",
2507 reply => "chat ",
2508 tooltip => "Player chat and shouts, global to the server.",
2509};
2510
2313# rough implementation of a future "reply" method that works 2511# rough implementation of a future "reply" method that works
2314# with dialog boxes. 2512# with dialog boxes.
2315#TODO: the first argument must go, split into a $npc->reply_to ( method 2513#TODO: the first argument must go, split into a $npc->reply_to ( method
2316sub cf::object::player::reply($$$;$) { 2514sub cf::object::player::reply($$$;$) {
2317 my ($self, $npc, $msg, $flags) = @_; 2515 my ($self, $npc, $msg, $flags) = @_;
… …
2328 my $dialog = $pl->{npc_dialog}; 2526 my $dialog = $pl->{npc_dialog};
2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2527 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2330 2528
2331 } else { 2529 } else {
2332 $msg = $npc->name . " says: $msg" if $npc; 2530 $msg = $npc->name . " says: $msg" if $npc;
2333 $self->message ($msg, $flags); 2531 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2334 } 2532 }
2335 } 2533 }
2336} 2534}
2337 2535
2338=item $object->send_msg ($channel, $msg, $color, [extra...]) 2536=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2363 2561
2364=item $player_object->enter_link 2562=item $player_object->enter_link
2365 2563
2366Freezes the player and moves him/her to a special map (C<{link}>). 2564Freezes the player and moves him/her to a special map (C<{link}>).
2367 2565
2368The player should be reasonably safe there for short amounts of time. You 2566The player should be reasonably safe there for short amounts of time (e.g.
2369I<MUST> call C<leave_link> as soon as possible, though. 2567for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link
2569map.
2370 2570
2371Will never block. 2571Will never block.
2372 2572
2373=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2374 2574
… …
2426 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2427 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2428 2628
2429 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2430 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2431 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2432 2632
2433 $map->load; 2633 $map->load;
2434 $map->load_neighbours; 2634 $map->load_neighbours;
2435 2635
2436 return unless $self->contr->active; 2636 return unless $self->contr->active;
2437 $self->activate_recursive;
2438 2637
2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2440 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2441} 2643}
2442 2644
2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2444 2646
2445Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2446her, loading and preparing them map, calling the provided $check callback 2648her, loading and preparing them map, calling the provided $check callback
2447that has to return the map if sucecssful, and then unfreezes the player on 2649that has to return the map if sucecssful, and then unfreezes the player on
2448the new (success) or old (failed) map position. In either case, $done will 2650the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process. 2651be called at the end of this process.
2450 2652
2653Note that $check will be called with a potentially non-loaded map, so if
2654it needs a loaded map it has to call C<< ->load >>.
2655
2451=cut 2656=cut
2452 2657
2453our $GOTOGEN; 2658our $GOTOGEN;
2454 2659
2455sub cf::object::player::goto { 2660sub cf::object::player::goto {
… …
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2665
2461 $self->enter_link; 2666 $self->enter_link;
2462 2667
2463 (async { 2668 (async {
2669 $Coro::current->{desc} = "player::goto $path $x $y";
2670
2464 # *tag paths override both path and x|y 2671 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2672 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2673 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2674 my $ob = $obs[rand @obs];
2468 2675
… …
2531} 2738}
2532 2739
2533sub prepare_random_map { 2740sub prepare_random_map {
2534 my ($exit) = @_; 2741 my ($exit) = @_;
2535 2742
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2743 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2744 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2745 # that depends on the exit object
2541 2746
2542 my $rmp = parse_random_map_params $exit->msg; 2747 my $rmp = parse_random_map_params $exit->msg;
… …
2544 if ($exit->map) { 2749 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2750 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2751 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2752 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2753 $rmp->{origin_y} = $exit->y;
2754
2755 $exit->map->touch;
2549 } 2756 }
2550 2757
2551 $rmp->{random_seed} ||= $exit->random_seed; 2758 $rmp->{random_seed} ||= $exit->random_seed;
2552 2759
2553 my $data = cf::to_json $rmp; 2760 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2761 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2762 my $meta = "$RANDOMDIR/$md5.meta";
2556 2763
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2764 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2765 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2766 undef $fh;
2560 aio_rename "$meta~", $meta; 2767 aio_rename "$meta~", $meta;
2561 2768
2769 my $slaying = "?random/$md5";
2770
2771 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2772 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2773 $exit->msg (undef);
2774 }
2564 } 2775 }
2565} 2776}
2566 2777
2567sub cf::object::player::enter_exit { 2778sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2779 my ($self, $exit) = @_;
2569 2780
2570 return unless $self->type == cf::PLAYER; 2781 return unless $self->type == cf::PLAYER;
2571 2782
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2783 $self->enter_link;
2584 2784
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2785 (async {
2590 $self->deactivate_recursive; # just to be sure 2786 $Coro::current->{desc} = "enter_exit";
2787
2591 unless (eval { 2788 unless (eval {
2789 $self->deactivate_recursive; # just to be sure
2790
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2800 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp;
2802
2592 $self->goto ($slaying, $hp, $sp); 2803 $self->goto ($map, $x, $y);
2593 2804
2805 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y)
2807 if $exit->flag (cf::FLAG_DAMNED);
2808
2594 1; 2809 1
2595 }) { 2810 }) {
2596 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2597 . "I'll try to bring you back to the map you were before. " 2812 . "I'll try to bring you back to the map you were before. "
2598 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2599 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2600 2815
2601 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
… …
2618sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2619 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2620 2835
2621 utf8::encode $text; 2836 utf8::encode $text;
2622 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2623} 2863}
2624 2864
2625=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2626 2866
2627Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2629the message, with C<log> being the default. If C<$color> is negative, suppress 2869the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2870the message unless the client supports the msg packet.
2631 2871
2632=cut 2872=cut
2633 2873
2874# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2635 "c/identify" => { 2882 "c/identify" => {
2636 id => "identify", 2883 id => "infobox",
2637 title => "Identify", 2884 title => "Identify",
2638 reply => undef, 2885 reply => undef,
2639 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2640 }, 2887 },
2641 "c/examine" => { 2888 "c/examine" => {
2642 id => "examine", 2889 id => "infobox",
2643 title => "Examine", 2890 title => "Examine",
2644 reply => undef, 2891 reply => undef,
2645 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2646 }, 2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2899 },
2900 "c/book" => {
2901 id => "infobox",
2902 title => "Book",
2903 reply => undef,
2904 tooltip => "The contents of a note or book",
2905 },
2906 "c/lookat" => {
2907 id => "infobox",
2908 title => "Look",
2909 reply => undef,
2910 tooltip => "What you saw there",
2911 },
2912 "c/who" => {
2913 id => "infobox",
2914 title => "Players",
2915 reply => undef,
2916 tooltip => "Shows players who are currently online",
2917 },
2918 "c/body" => {
2919 id => "infobox",
2920 title => "Body Parts",
2921 reply => undef,
2922 tooltip => "Shows which body parts you posess and are available",
2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2960 "c/uptime" => {
2961 id => "infobox",
2962 title => "Uptime",
2963 reply => undef,
2964 tooltip => "How long the server has been running since last restart",
2965 },
2966 "c/mapinfo" => {
2967 id => "infobox",
2968 title => "Map Info",
2969 reply => undef,
2970 tooltip => "Information related to the maps",
2971 },
2972 "c/party" => {
2973 id => "party",
2974 title => "Party",
2975 reply => "gsay ",
2976 tooltip => "Messages and chat related to your party",
2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2647); 2986);
2648 2987
2649sub cf::client::send_msg { 2988sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2990
2652 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2653 2993
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2995
2656 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2997 if ($CHANNEL{$channel}) {
2998 $channel = $CHANNEL{$channel};
2658 2999
3000 $self->ext_msg (channel_info => $channel);
3001 $channel = $channel->{id};
3002
2659 if (ref $channel) { 3003 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2664 if $self->can_msg;
2665 } 3008 }
2666 3009
2667 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2668 } 3011 }
2669 3012
2670 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2671 3014
2672 if ($self->can_msg) {
2673 # default colour, mask it out 3015 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2676 3018
2677 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2679 } else { 3022 );
2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690 3023
2691 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2692
2693 utf8::encode $msg;
2694
2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2698 } else {
2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2700 $self->send_packet ("drawinfo $color $msg")
2701 }
2702 }
2703 }
2704} 3025}
2705 3026
2706=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2707 3028
2708Sends an ext event to the client. 3029Sends an ext event to the client.
… …
2711 3032
2712sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2713 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2714 3035
2715 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2718 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 } 3041 }
2721} 3042}
2722 3043
2723=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2724 3045
… …
2728 3049
2729sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2731 3052
2732 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove 3056 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 } 3059 }
2739} 3060}
2740 3061
2741=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2742 3063
… …
2843 3164
2844 $coro 3165 $coro
2845} 3166}
2846 3167
2847cf::client->attach ( 3168cf::client->attach (
2848 on_destroy => sub { 3169 on_client_destroy => sub {
2849 my ($ns) = @_; 3170 my ($ns) = @_;
2850 3171
2851 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2852 }, 3173 },
2853); 3174);
… …
2869our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
2870 3191
2871$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
2872 3193
2873$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
2875 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
2876 sort time 3197 sort time
2877)); 3198));
2878 3199
2879# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
… …
2881=pod 3202=pod
2882 3203
2883The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
2884 3205
2885 cf::object 3206 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3207 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3208 insert remove name archname title slaying race decrease split
3209 value
2888 3210
2889 cf::object::player 3211 cf::object::player
2890 player 3212 player
2891 3213
2892 cf::player 3214 cf::player
… …
2897 3219
2898=cut 3220=cut
2899 3221
2900for ( 3222for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
2903 decrease_ob_nr)], 3225 decrease split destroy change_exp value msg lore send_msg)],
2904 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
2906 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
2907) { 3229) {
2908 no strict 'refs'; 3230 no strict 'refs';
2909 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
2910 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2928 3250
2929 my $qcode = $code; 3251 my $qcode = $code;
2930 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2931 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
2932 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
2933 local $_; 3258 local $_;
2934 local @safe::cf::_safe_eval_args = values %vars;
2935 3259
2936 my $eval = 3260 my $eval =
2937 "do {\n" 3261 "do {\n"
2938 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2939 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
2940 . $code 3264 . $code
2941 . "\n}" 3265 . "\n}"
2942 ; 3266 ;
2943 3267
3268 if ($CFG{safe_eval}) {
2944 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
2945 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2946 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
2947 3277
2948 if ($@) { 3278 if ($@) {
2949 warn "$@"; 3279 warn "$@";
2950 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
2951 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
… …
2970=cut 3300=cut
2971 3301
2972sub register_script_function { 3302sub register_script_function {
2973 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
2974 3304
2975 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
2976 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
2977} 3307}
2978 3308
2979=back 3309=back
2980 3310
2981=cut 3311=cut
… …
3002 3332
3003 $facedata->{version} == 2 3333 $facedata->{version} == 2
3004 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3005 3335
3006 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3007 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC, 3339 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3010 }; 3342 };
3011 cf::cede_to_tick; 3343 cf::cede_to_tick;
3012 3344
3013 { 3345 {
3014 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3015 3347
3016 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350
3018 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3022 3355
3023 cf::cede_to_tick; 3356 cf::cede_to_tick;
3024 } 3357 }
3025 3358
3026 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3360 next unless $info->{smooth};
3361
3028 my $idx = cf::face::find $face 3362 my $idx = cf::face::find $face
3029 or next; 3363 or next;
3364
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3365 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3366 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3368 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3369 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3048 3383
3049 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3050 } 3385 }
3051 3386
3052 { 3387 {
3053 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3056 3389
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3391 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
3062 3393
3063 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3064 # prepend meta info 3395 cf::face::set_type $idx, $info->{type};
3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
3071 $data = pack "(w/a*)*", $meta, $info->{data};
3072 } else { 3396 } else {
3073 $data = $info->{data}; 3397 $RESOURCE{$name} = $info;
3074 } 3398 }
3075 3399
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3400 cf::cede_to_tick;
3080 } 3401 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3402 }
3403
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3405
3101 1 3406 1
3102} 3407}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3103 3428
3104register_exticmd fx_want => sub { 3429register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3430 my ($ns, $want) = @_;
3106 3431
3107 while (my ($k, $v) = each %$want) { 3432 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v); 3433 $ns->fx_want ($k, $v);
3109 } 3434 }
3110}; 3435};
3436
3437sub load_resource_file($) {
3438 my $guard = lock_acquire "load_resource_file";
3439
3440 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100;
3442 cf::arch::commit_load;
3443
3444 $status
3445}
3111 3446
3112sub reload_regions { 3447sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework 3448 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?) 3449 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = (); 3450 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3129} 3464}
3130 3465
3131sub reload_archetypes { 3466sub reload_archetypes {
3132 load_resource_file "$DATADIR/archetypes" 3467 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n"; 3468 or die "unable to load archetypes\n";
3134 #d# NEED to laod twice to resolve forward references
3135 # this really needs to be done in an extra post-pass
3136 # (which needs to be synchronous, so solve it differently)
3137 load_resource_file "$DATADIR/archetypes"
3138 or die "unable to load archetypes\n";
3139} 3469}
3140 3470
3141sub reload_treasures { 3471sub reload_treasures {
3142 load_resource_file "$DATADIR/treasures" 3472 load_resource_file "$DATADIR/treasures"
3143 or die "unable to load treasurelists\n"; 3473 or die "unable to load treasurelists\n";
3144} 3474}
3145 3475
3146sub reload_resources { 3476sub reload_resources {
3147 warn "reloading resource files...\n"; 3477 warn "reloading resource files...\n";
3148 3478
3479 reload_facedata;
3480 reload_archetypes;
3149 reload_regions; 3481 reload_regions;
3150 reload_facedata;
3151 #reload_archetypes;#d#
3152 reload_archetypes;
3153 reload_treasures; 3482 reload_treasures;
3154 3483
3155 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3156} 3485}
3157 3486
3158sub init {
3159 reload_resources;
3160}
3161
3162sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3164 or return; 3491 or return;
3165 3492
3166 local $/; 3493 local $/;
3167 *CFG = YAML::Syck::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3168 3495
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3170 3497
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3172 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3176 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3177 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3178 }; 3505 };
3179 warn $@ if $@; 3506 warn $@ if $@;
3180 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3510}
3511
3512sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!";
3515 flock $fh, &Fcntl::LOCK_EX
3516 or die "$PIDFILE: flock: $!";
3517 $fh
3518}
3519
3520# make sure only one server instance is running at any one time
3521sub atomic {
3522 my $fh = pidfile;
3523
3524 my $pid = <$fh>;
3525 kill 9, $pid if $pid > 0;
3526
3527 seek $fh, 0, 0;
3528 print $fh $$;
3529}
3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3181} 3538}
3182 3539
3183sub main { 3540sub main {
3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549
3184 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3553 (async {
3188 Event::one_event; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3555 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3190 }; 3557 };
3191 3558
3559 evthread_start IO::AIO::poll_fileno;
3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3192 reload_config; 3571 reload_config;
3193 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3194 load_extensions; 3582 load_extensions;
3195 3583
3196 $TICK_WATCHER->start; 3584 utime time, time, $RUNTIMEFILE;
3197 Event::loop; 3585
3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589
3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 main_loop;
3198} 3594}
3199 3595
3200############################################################################# 3596#############################################################################
3201# initialisation and cleanup 3597# initialisation and cleanup
3202 3598
3203# install some emergency cleanup handlers 3599# install some emergency cleanup handlers
3204BEGIN { 3600BEGIN {
3601 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3602 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3603 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3604 cf::cleanup "SIG$signal";
3213 },
3214 ); 3605 };
3215 } 3606 }
3216} 3607}
3217 3608
3218sub write_runtime { 3609sub write_runtime_sync {
3219 my $runtime = "$LOCALDIR/runtime"; 3610 my $t0 = AE::time;
3220 3611
3221 # first touch the runtime file to show we are still running: 3612 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time. 3613 # the fsync below can take a very very long time.
3223 3614
3224 IO::AIO::aio_utime $runtime, undef, undef; 3615 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3225 3616
3226 my $guard = cf::lock_acquire "write_runtime"; 3617 my $guard = cf::lock_acquire "write_runtime";
3227 3618
3228 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3619 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3229 or return; 3620 or return;
3230 3621
3231 my $value = $cf::RUNTIME + 90 + 10; 3622 my $value = $cf::RUNTIME + 90 + 10;
3232 # 10 is the runtime save interval, for a monotonic clock 3623 # 10 is the runtime save interval, for a monotonic clock
3233 # 60 allows for the watchdog to kill the server. 3624 # 60 allows for the watchdog to kill the server.
… …
3243 aio_utime $fh, undef, undef; 3634 aio_utime $fh, undef, undef;
3244 3635
3245 close $fh 3636 close $fh
3246 or return; 3637 or return;
3247 3638
3248 aio_rename "$runtime~", $runtime 3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3249 and return; 3640 and return;
3250 3641
3251 warn "runtime file written.\n"; 3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3252 3643
3253 1 3644 1
3645}
3646
3647our $uuid_lock;
3648our $uuid_skip;
3649
3650sub write_uuid_sync($) {
3651 $uuid_skip ||= $_[0];
3652
3653 return if $uuid_lock;
3654 local $uuid_lock = 1;
3655
3656 my $uuid = "$LOCALDIR/uuid";
3657
3658 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3659 or return;
3660
3661 my $value = uuid_seq uuid_cur;
3662
3663 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n";
3665 return;
3666 }
3667
3668 my $value = uuid_str $value + $uuid_skip;
3669 $uuid_skip = 0;
3670
3671 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3672 and return;
3673
3674 # always fsync - this file is important
3675 aio_fsync $fh
3676 and return;
3677
3678 close $fh
3679 or return;
3680
3681 aio_rename "$uuid~", $uuid
3682 and return;
3683
3684 warn "uuid file written ($value).\n";
3685
3686 1
3687
3688}
3689
3690sub write_uuid($$) {
3691 my ($skip, $sync) = @_;
3692
3693 $sync ? write_uuid_sync $skip
3694 : async { write_uuid_sync $skip };
3254} 3695}
3255 3696
3256sub emergency_save() { 3697sub emergency_save() {
3257 my $freeze_guard = cf::freeze_mainloop; 3698 my $freeze_guard = cf::freeze_mainloop;
3258 3699
3259 warn "enter emergency perl save\n"; 3700 warn "emergency_perl_save: enter\n";
3260 3701
3261 cf::sync_job { 3702 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707
3262 # use a peculiar iteration method to avoid tripping on perl 3708 # use a peculiar iteration method to avoid tripping on perl
3263 # refcount bugs in for. also avoids problems with players 3709 # refcount bugs in for. also avoids problems with players
3264 # and maps saved/destroyed asynchronously. 3710 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3711 warn "emergency_perl_save: begin player save\n";
3266 for my $login (keys %cf::PLAYER) { 3712 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3713 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3714 $pl->valid or next;
3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3716 $pl->save;
3270 } 3717 }
3271 warn "end emergency player save\n"; 3718 warn "emergency_perl_save: end player save\n";
3272 3719
3273 warn "begin emergency map save\n"; 3720 warn "emergency_perl_save: begin map save\n";
3274 for my $path (keys %cf::MAP) { 3721 for my $path (keys %cf::MAP) {
3275 my $map = $cf::MAP{$path} or next; 3722 my $map = $cf::MAP{$path} or next;
3276 $map->valid or next; 3723 $map->valid or next;
3277 $map->save; 3724 $map->save;
3278 } 3725 }
3279 warn "end emergency map save\n"; 3726 warn "emergency_perl_save: end map save\n";
3280 3727
3281 warn "begin emergency database checkpoint\n"; 3728 warn "emergency_perl_save: begin database checkpoint\n";
3282 BDB::db_env_txn_checkpoint $DB_ENV; 3729 BDB::db_env_txn_checkpoint $DB_ENV;
3283 warn "end emergency database checkpoint\n"; 3730 warn "emergency_perl_save: end database checkpoint\n";
3731
3732 warn "emergency_perl_save: begin write uuid\n";
3733 write_uuid_sync 1;
3734 warn "emergency_perl_save: end write uuid\n";
3284 }; 3735 };
3285 3736
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3286 warn "leave emergency perl save\n"; 3742 warn "emergency_perl_save: leave\n";
3287} 3743}
3288 3744
3289sub post_cleanup { 3745sub post_cleanup {
3290 my ($make_core) = @_; 3746 my ($make_core) = @_;
3291 3747
3292 warn Carp::longmess "post_cleanup backtrace" 3748 warn Carp::longmess "post_cleanup backtrace"
3293 if $make_core; 3749 if $make_core;
3750
3751 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$;
3753}
3754
3755# a safer delete_package, copied from Symbol
3756sub clear_package($) {
3757 my $pkg = shift;
3758
3759 # expand to full symbol table name if needed
3760 unless ($pkg =~ /^main::.*::$/) {
3761 $pkg = "main$pkg" if $pkg =~ /^::/;
3762 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3763 $pkg .= '::' unless $pkg =~ /::$/;
3764 }
3765
3766 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3767 my $stem_symtab = *{$stem}{HASH};
3768
3769 defined $stem_symtab and exists $stem_symtab->{$leaf}
3770 or return;
3771
3772 # clear all symbols
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 }
3778 warn "cleared package $pkg\n";#d#
3294} 3779}
3295 3780
3296sub do_reload_perl() { 3781sub do_reload_perl() {
3297 # can/must only be called in main 3782 # can/must only be called in main
3298 if ($Coro::current != $Coro::main) { 3783 if ($Coro::current != $Coro::main) {
3299 warn "can only reload from main coroutine"; 3784 warn "can only reload from main coroutine";
3300 return; 3785 return;
3301 } 3786 }
3302 3787
3788 return if $RELOAD++;
3789
3790 my $t1 = AE::time;
3791
3792 while ($RELOAD) {
3303 warn "reloading..."; 3793 warn "reloading...";
3304 3794
3305 warn "entering sync_job"; 3795 warn "entering sync_job";
3306 3796
3307 cf::sync_job { 3797 cf::sync_job {
3308 cf::write_runtime; # external watchdog should not bark 3798 cf::write_runtime_sync; # external watchdog should not bark
3309 cf::emergency_save; 3799 cf::emergency_save;
3310 cf::write_runtime; # external watchdog should not bark 3800 cf::write_runtime_sync; # external watchdog should not bark
3311 3801
3312 warn "syncing database to disk"; 3802 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3803 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3804
3315 # if anything goes wrong in here, we should simply crash as we already saved 3805 # if anything goes wrong in here, we should simply crash as we already saved
3316 3806
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests"; 3807 warn "flushing outstanding aio requests";
3323 for (;;) {
3324 BDB::flush;
3325 IO::AIO::flush;
3326 Coro::cede;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3808 while (IO::AIO::nreqs || BDB::nreqs) {
3328 warn "iterate..."; 3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3329 }
3330
3331 ++$RELOAD;
3332
3333 warn "cancelling all extension coros";
3334 $_->cancel for values %EXT_CORO;
3335 %EXT_CORO = ();
3336
3337 warn "removing commands";
3338 %COMMAND = ();
3339
3340 warn "removing ext/exti commands";
3341 %EXTCMD = ();
3342 %EXTICMD = ();
3343
3344 warn "unloading/nuking all extensions";
3345 for my $pkg (@EXTS) {
3346 warn "... unloading $pkg";
3347
3348 if (my $cb = $pkg->can ("unload")) {
3349 eval {
3350 $cb->($pkg);
3351 1
3352 } or warn "$pkg unloaded, but with errors: $@";
3353 } 3810 }
3354 3811
3355 warn "... nuking $pkg"; 3812 warn "cancelling all extension coros";
3356 Symbol::delete_package $pkg; 3813 $_->cancel for values %EXT_CORO;
3357 } 3814 %EXT_CORO = ();
3358 3815
3359 warn "unloading all perl modules loaded from $LIBDIR"; 3816 warn "removing commands";
3360 while (my ($k, $v) = each %INC) { 3817 %COMMAND = ();
3361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3362 3818
3819 warn "removing ext/exti commands";
3820 %EXTCMD = ();
3821 %EXTICMD = ();
3822
3823 warn "unloading/nuking all extensions";
3824 for my $pkg (@EXTS) {
3363 warn "... unloading $k"; 3825 warn "... unloading $pkg";
3364 delete $INC{$k};
3365 3826
3366 $k =~ s/\.pm$//;
3367 $k =~ s/\//::/g;
3368
3369 if (my $cb = $k->can ("unload_module")) { 3827 if (my $cb = $pkg->can ("unload")) {
3828 eval {
3370 $cb->(); 3829 $cb->($pkg);
3830 1
3831 } or warn "$pkg unloaded, but with errors: $@";
3832 }
3833
3834 warn "... clearing $pkg";
3835 clear_package $pkg;
3371 } 3836 }
3372 3837
3373 Symbol::delete_package $k; 3838 warn "unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841
3842 warn "... unloading $k";
3843 delete $INC{$k};
3844
3845 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g;
3847
3848 if (my $cb = $k->can ("unload_module")) {
3849 $cb->();
3850 }
3851
3852 clear_package $k;
3374 } 3853 }
3375 3854
3376 warn "getting rid of safe::, as good as possible"; 3855 warn "getting rid of safe::, as good as possible";
3377 Symbol::delete_package "safe::$_" 3856 clear_package "safe::$_"
3378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3379 3858
3380 warn "unloading cf.pm \"a bit\""; 3859 warn "unloading cf.pm \"a bit\"";
3381 delete $INC{"cf.pm"}; 3860 delete $INC{"cf.pm"};
3382 delete $INC{"cf/pod.pm"}; 3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3383 3862
3384 # don't, removes xs symbols, too, 3863 # don't, removes xs symbols, too,
3385 # and global variables created in xs 3864 # and global variables created in xs
3386 #Symbol::delete_package __PACKAGE__; 3865 #clear_package __PACKAGE__;
3387 3866
3388 warn "unload completed, starting to reload now"; 3867 warn "unload completed, starting to reload now";
3389 3868
3390 warn "reloading cf.pm"; 3869 warn "reloading cf.pm";
3391 require cf; 3870 require cf;
3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3871 cf::_connect_to_perl_1;
3393 3872
3394 warn "loading config and database again"; 3873 warn "loading config and database again";
3395 cf::reload_config; 3874 cf::reload_config;
3396 3875
3397 warn "loading extensions"; 3876 warn "loading extensions";
3398 cf::load_extensions; 3877 cf::load_extensions;
3399 3878
3879 if ($REATTACH_ON_RELOAD) {
3400 warn "reattaching attachments to objects/players"; 3880 warn "reattaching attachments to objects/players";
3401 _global_reattach; # objects, sockets 3881 _global_reattach; # objects, sockets
3402 warn "reattaching attachments to maps"; 3882 warn "reattaching attachments to maps";
3403 reattach $_ for values %MAP; 3883 reattach $_ for values %MAP;
3404 warn "reattaching attachments to players"; 3884 warn "reattaching attachments to players";
3405 reattach $_ for values %PLAYER; 3885 reattach $_ for values %PLAYER;
3886 }
3406 3887
3888 warn "running post_init jobs";
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890
3407 warn "leaving sync_job"; 3891 warn "leaving sync_job";
3408 3892
3409 1 3893 1
3410 } or do { 3894 } or do {
3411 warn $@; 3895 warn $@;
3412 warn "error while reloading, exiting."; 3896 cf::cleanup "error while reloading, exiting.";
3413 exit 1;
3414 }; 3897 };
3415 3898
3416 warn "reloaded"; 3899 warn "reloaded";
3900 --$RELOAD;
3901 }
3902
3903 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n";
3417}; 3905};
3418 3906
3419our $RELOAD_WATCHER; # used only during reload 3907our $RELOAD_WATCHER; # used only during reload
3420 3908
3421sub reload_perl() { 3909sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3910 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3911 # coro crashes during coro_state_free->destroy here.
3424 3912
3425 $RELOAD_WATCHER ||= Event->timer ( 3913 $RELOAD_WATCHER ||= cf::async {
3426 reentrant => 0, 3914 Coro::AIO::aio_wait cache_extensions;
3427 after => 0, 3915
3428 data => WF_AUTOCANCEL, 3916 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3429 cb => sub {
3430 do_reload_perl; 3917 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3918 undef $RELOAD_WATCHER;
3432 }, 3919 };
3433 ); 3920 };
3434} 3921}
3435 3922
3436register_command "reload" => sub { 3923register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3924 my ($who, $arg) = @_;
3438 3925
3439 if ($who->flag (FLAG_WIZ)) { 3926 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3927 $who->message ("reloading server.");
3928 async {
3929 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3930 reload_perl;
3931 };
3442 } 3932 }
3443}; 3933};
3444 3934
3445unshift @INC, $LIBDIR; 3935unshift @INC, $LIBDIR;
3446 3936
… …
3448 3938
3449our @WAIT_FOR_TICK; 3939our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN; 3940our @WAIT_FOR_TICK_BEGIN;
3451 3941
3452sub wait_for_tick { 3942sub wait_for_tick {
3453 return unless $TICK_WATCHER->is_active;
3454 return if $Coro::current == $Coro::main; 3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3455 3944
3456 my $signal = new Coro::Signal; 3945 my $signal = new Coro::Signal;
3457 push @WAIT_FOR_TICK, $signal; 3946 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait; 3947 $signal->wait;
3459} 3948}
3460 3949
3461sub wait_for_tick_begin { 3950sub wait_for_tick_begin {
3462 return unless $TICK_WATCHER->is_active;
3463 return if $Coro::current == $Coro::main; 3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3464 3952
3465 my $signal = new Coro::Signal; 3953 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3954 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3955 $signal->wait;
3468} 3956}
3469 3957
3470$TICK_WATCHER = Event->timer ( 3958sub tick {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 3959 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3960 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 3961 unless ++$bug_warning > 10;
3480 return; 3962 return;
3481 } 3963 }
3482 3964
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3965 cf::server_tick; # one server iteration
3486 3966
3487 $RUNTIME += $TICK; 3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3488 $NEXT_TICK += $TICK;
3489 3968
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3971 Coro::async_pool {
3972 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3973 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 3974 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3975 };
3976 }
3497 3977
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3978 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3979 $sig->send;
3500 } 3980 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3981 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3982 $sig->send;
3503 } 3983 }
3504 3984
3505 $NOW = Event::time; 3985 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3987
3516 _post_tick; 3988 if (0) {
3989 if ($NEXT_TICK) {
3990 my $jitter = $TICK_START - $NEXT_TICK;
3991 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3992 warn "jitter $JITTER\n";#d#
3993 }
3517 }, 3994 }
3518); 3995}
3519 3996
3520{ 3997{
3998 # configure BDB
3999
3521 BDB::min_parallel 8; 4000 BDB::min_parallel 16;
3522 BDB::max_poll_time $TICK * 0.1; 4001 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 4002 $AnyEvent::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 4003
3547 unless ($DB_ENV) { 4004 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 4005 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3550 | BDB::LOG_AUTOREMOVE, 1); 4007 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4008 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4009 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4010 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 4011
3554 cf::sync_job { 4012 cf::sync_job {
3555 eval { 4013 eval {
… …
3565 4023
3566 cf::cleanup "db_env_open(db): $@" if $@; 4024 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 4025 };
3568 } 4026 }
3569 4027
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 4028 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4029 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 4030 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4031 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4032 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 4033 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 4034 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4035 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 4036 };
3600} 4037}
3601 4038
3602{ 4039{
4040 # configure IO::AIO
4041
3603 IO::AIO::min_parallel 8; 4042 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 4043 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 4044 undef $AnyEvent::AIO::WATCHER;
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 4045}
3616 4046
3617my $_log_backtrace; 4047my $_log_backtrace;
3618 4048
3619sub _log_backtrace { 4049sub _log_backtrace {
… …
3622 $msg =~ s/\n//; 4052 $msg =~ s/\n//;
3623 4053
3624 # limit the # of concurrent backtraces 4054 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 4055 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 4056 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg;
3627 async { 4058 async {
4059 $Coro::current->{desc} = "abt $msg";
4060
3628 my @bt = fork_call { 4061 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 4062 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4063 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4064 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 4065 or die "addr2line: $!";
… …
3640 } 4073 }
3641 4074
3642 @funcs 4075 @funcs
3643 }; 4076 };
3644 4077
3645 LOG llevInfo, "[ABT] $msg\n"; 4078 LOG llevInfo, "[ABT] $perl_bt\n";
4079 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3646 LOG llevInfo, "[ABT] $_\n" for @bt; 4080 LOG llevInfo, "[ABT] $_\n" for @bt;
3647 --$_log_backtrace; 4081 --$_log_backtrace;
3648 }; 4082 };
3649 } else { 4083 } else {
3650 LOG llevInfo, "[ABT] $msg\n"; 4084 LOG llevInfo, "[ABT] $msg\n";
3651 LOG llevInfo, "[ABT] [suppressed]\n"; 4085 LOG llevInfo, "[ABT] [suppressed]\n";
3652 } 4086 }
3653} 4087}
3654 4088
3655# load additional modules 4089# load additional modules
3656use cf::pod; 4090require "cf/$_.pm" for @EXTRA_MODULES;
4091cf::_connect_to_perl_2;
3657 4092
3658END { cf::emergency_save } 4093END { cf::emergency_save }
3659 4094
36601 40951
3661 4096

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines