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

Diff Legend

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