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.349 by root, Fri Aug 31 04:10:43 2007 UTC vs.
Revision 1.516 by root, Thu Apr 15 06:05:52 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; # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # 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;
290 382
291sub lock_wait($) { 383sub lock_wait($) {
292 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
293
294 # wait for lock, if any
295 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule;
298 }
299} 385}
300 386
301sub lock_acquire($) { 387sub lock_acquire($) {
302 my ($key) = @_; 388 $LOCKS->guard ($_[0])
303
304 # wait, to be sure we are not locked
305 lock_wait $key;
306
307 $LOCK{$key} = [];
308
309 Coro::guard {
310 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} };
312 }
313} 389}
314 390
315sub lock_active($) { 391sub lock_active($) {
316 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
317
318 ! ! $LOCK{$key}
319} 393}
320 394
321sub freeze_mainloop { 395sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 396 tick_inhibit_inc;
323 397
324 my $guard = Coro::guard { 398 &Guard::guard (\&tick_inhibit_dec);
325 $TICK_WATCHER->start; 399}
326 }; 400
327 $TICK_WATCHER->stop; 401=item cf::periodic $interval, $cb
328 $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
329} 414}
330 415
331=item cf::get_slot $time[, $priority[, $name]] 416=item cf::get_slot $time[, $priority[, $name]]
332 417
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 418Allocate $time seconds of blocking CPU time at priority C<$priority>:
341 426
342=cut 427=cut
343 428
344our @SLOT_QUEUE; 429our @SLOT_QUEUE;
345our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
346 432
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
435 $Coro::current->desc ("timeslot manager");
436
349 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
350 439
351 while () { 440 while () {
352 next_job: 441 next_job:
442
353 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
354 if ($avail > 0.01) { 444
355 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
357 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send; 449 $job->[2]->send;
359 Coro::cede; 450 Coro::cede;
360 goto next_job; 451 goto next_job;
361 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
362 } 454 }
363 } 455 }
364 456
365 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 460 $signal->wait;
369 } else { 461 } else {
462 $busy = 0;
370 Coro::schedule; 463 Coro::schedule;
371 } 464 }
372 } 465 }
373}; 466};
374 467
375sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
376 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
377 472
378 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
379 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
380 476
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
394 490
395BEGIN { *async = \&Coro::async_pool } 491BEGIN { *async = \&Coro::async_pool }
396 492
397=item cf::sync_job { BLOCK } 493=item cf::sync_job { BLOCK }
398 494
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 495The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 496is always able to handle events or runnable, as Deliantra is only
401partly 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
402acceptable. 498acceptable.
403 499
404If 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
405the given BLOCK in another coroutine while waiting for the result. The 501the given BLOCK in another coroutine while waiting for the result. The
410 506
411sub sync_job(&) { 507sub sync_job(&) {
412 my ($job) = @_; 508 my ($job) = @_;
413 509
414 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 511 my $time = AE::time;
416 512
417 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
419 515
420 # TODO: use suspend/resume instead 516 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 517
422 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
423 519
424 my $busy = 1; 520 my $busy = 1;
425 my @res; 521 my @res;
426 522
427 (async { 523 (async {
524 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 525 @res = eval { $job->() };
429 warn $@ if $@; 526 warn $@ if $@;
430 undef $busy; 527 undef $busy;
431 })->prio (Coro::PRIO_MAX); 528 })->prio (Coro::PRIO_MAX);
432 529
433 while ($busy) { 530 while ($busy) {
434 Coro::cede or Event::one_event; 531 if (Coro::nready) {
532 Coro::cede_notself;
533 } else {
534 EV::loop EV::LOOP_ONESHOT;
435 } 535 }
536 }
436 537
437 $time = Event::time - $time; 538 my $time = AE::time - $time;
438 539
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
443 541
444 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
445 } else { 543 } else {
446 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
447 545
472=item fork_call { }, $args 570=item fork_call { }, $args
473 571
474Executes the given code block with the given arguments in a seperate 572Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 573process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 574Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 575never block itself or use any form of event handling.
478 576
479=cut 577=cut
480 578
481sub fork_call(&@) { 579sub fork_call(&@) {
482 my ($cb, @args) = @_; 580 my ($cb, @args) = @_;
483 581
484 # we seemingly have to make a local copy of the whole thing, 582 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 583 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 584 # TODO: investigate and fix (likely this will be rather laborious)
487 585
488 my @res = Coro::Util::fork_eval { 586 my @res = Coro::Util::fork_eval {
489 reset_signals; 587 reset_signals;
490 &$cb 588 &$cb
491 }, @args; 589 }, @args;
492 590
493 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
494} 592}
495 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
496=item $value = cf::db_get $family => $key 632=item $value = cf::db_get $family => $key
497 633
498Returns a single value from the environment database. 634Returns a single value from the environment database.
499 635
500=item cf::db_put $family => $key => $value 636=item cf::db_put $family => $key => $value
501 637
502Stores 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
503data 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).
504 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
505=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}
506 664
507our $DB; 665our $DB;
508 666
509sub db_init { 667sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 668 cf::sync_job {
514 eval { 669 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 670 };
524} 671}
525 672
526sub db_get($$) { 673sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 674 my $key = "$_[0]/$_[1]";
528 675
626 773
627############################################################################# 774#############################################################################
628 775
629=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
630 777
631Many 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
632attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
634 781
635In 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>
636C<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
637Crossfire TRT). 784Deliantra).
638 785
639=over 4 786=over 4
640 787
641=item $attachable->attach ($attachment, key => $value...) 788=item $attachable->attach ($attachment, key => $value...)
642 789
686=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
687 834
688Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
690 837
691Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
692that 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.
693 840
694These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
695 842
696=over 4 843=over 4
924 } 1071 }
925 1072
926 0 1073 0
927} 1074}
928 1075
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1076=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1077
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1078=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1079
933Generate an object-specific event with the given arguments. 1080Generate an object-specific event with the given arguments.
934 1081
940 1087
941=cut 1088=cut
942 1089
943############################################################################# 1090#############################################################################
944# object support 1091# object support
945#
946 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#
947sub _can_merge { 1126sub _can_merge {
948 my ($ob1, $ob2) = @_; 1127 my ($ob1, $ob2) = @_;
949 1128
950 local $Storable::canonical = 1; 1129 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1130
954 $fob1 eq $fob2 1131 # we do the slow way here
1132 return _object_equal $ob1, $ob2
955} 1133}
956 1134
957sub reattach { 1135sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1137 my ($obj) = @_;
960 1138
1139 # no longer needed after getting rid of delete_package?
961 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
962 1141
963 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
964 1143
965 @$registry = (); 1144 @$registry = ();
966 1145
981cf::attachable->attach ( 1160cf::attachable->attach (
982 prio => -1000000, 1161 prio => -1000000,
983 on_instantiate => sub { 1162 on_instantiate => sub {
984 my ($obj, $data) = @_; 1163 my ($obj, $data) = @_;
985 1164
986 $data = from_json $data; 1165 $data = decode_json $data;
987 1166
988 for (@$data) { 1167 for (@$data) {
989 my ($name, $args) = @$_; 1168 my ($name, $args) = @$_;
990 1169
991 $obj->attach ($name, %{$args || {} }); 1170 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1186sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1187 my ($filename, $rdata, $objs) = @_;
1009 1188
1010 sync_job { 1189 sync_job {
1011 if (length $$rdata) { 1190 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1014 1194
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 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 }
1019 close $fh; 1202 aio_close $fh;
1020 1203
1021 if (@$objs) { 1204 if (@$objs) {
1022 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) {
1023 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1026 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 }
1027 close $fh; 1213 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1215 }
1030 } else { 1216 } else {
1031 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1032 } 1218 }
1033 1219
1034 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1035 } else { 1224 } else {
1036 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1037 } 1226 }
1038 } else { 1227 } else {
1039 aio_unlink $filename; 1228 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1041 } 1230 }
1042 } 1231 };
1043} 1232}
1044 1233
1045sub object_freezer_as_string { 1234sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1235 my ($rdata, $objs) = @_;
1047 1236
1059 or return; 1248 or return;
1060 1249
1061 unless (aio_stat "$filename.pst") { 1250 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1251 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1252 or return;
1253
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1254 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs};
1065 } 1256 }
1066 1257
1258 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1259 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1260 $decname, length $data, scalar @{$av || []};
1261
1069 return ($data, $av); 1262 ($data, $av)
1070} 1263}
1071 1264
1072=head2 COMMAND CALLBACKS 1265=head2 COMMAND CALLBACKS
1073 1266
1074=over 4 1267=over 4
1128 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1129 1322
1130 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1131} 1324}
1132 1325
1326use File::Glob ();
1327
1133cf::player->attach ( 1328cf::player->attach (
1134 on_command => sub { 1329 on_unknown_command => sub {
1135 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1136 1331
1137 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1138 or return; 1333 or return;
1139 1334
1169 1364
1170 cf::override; 1365 cf::override;
1171 }, 1366 },
1172); 1367);
1173 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
1174sub load_extensions { 1382sub load_extensions {
1175 cf::sync_job { 1383 cf::sync_job {
1176 my %todo; 1384 my %todo;
1177 1385
1178 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1197 1405
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200 1408
1201 $ext{source} = 1409 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1204 . $source 1412 . $source
1205 . "\n};\n1"; 1413 . "\n};\n1";
1206 1414
1207 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1208 } 1416 }
1209 1417
1418 my $pass = 0;
1210 my %done; 1419 my %done;
1211 while (%todo) { 1420 while (%todo) {
1212 my $progress; 1421 my $progress;
1213 1422
1423 ++$pass;
1424
1425 ext:
1214 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip 1428 next ext
1217 unless exists $done{$_}; 1429 unless exists $done{$_};
1218 } 1430 }
1219 1431
1220 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1221 1433
1222 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1223 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1224 : "$v->{base}: extension inactive.\n";
1225 1438
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1226 if (exists $v->{meta}{mandatory}) { 1440 if exists $v->{meta}{mandatory};
1227 warn $msg; 1441 } else {
1228 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1229 exit 1; 1443 push @EXTS, $v->{pkg};
1230 } 1444 $progress = 1;
1231 1445
1232 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1233 } 1448 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
1238 } 1449 }
1239 1450
1240 skip: 1451 unless ($progress) {
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1242 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1243 } 1459 }
1244 }; 1460 };
1245} 1461}
1246 1462
1247############################################################################# 1463#############################################################################
1248 1464
1249=back 1465=back
1250 1466
1251=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1252 1468
1253Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1254 1470
1255=cut 1471=cut
1256 1472
1257package cf::player; 1473package cf::player;
1258 1474
1259use Coro::AIO; 1475use Coro::AIO;
1260 1476
1261=head3 cf::player 1477=head3 cf::player
1262 1478
1263=over 4 1479=over 4
1480
1481=item cf::player::num_playing
1482
1483Returns the official number of playing players, as per the Crossfire metaserver rules.
1484
1485=cut
1486
1487sub num_playing {
1488 scalar grep
1489 $_->ob->map
1490 && !$_->hidden
1491 && !$_->ob->flag (cf::FLAG_WIZ),
1492 cf::player::list
1493}
1264 1494
1265=item cf::player::find $login 1495=item cf::player::find $login
1266 1496
1267Returns the given player object, loading it if necessary (might block). 1497Returns the given player object, loading it if necessary (might block).
1268 1498
1287 1517
1288sub exists($) { 1518sub exists($) {
1289 my ($login) = @_; 1519 my ($login) = @_;
1290 1520
1291 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1292 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1293} 1523}
1294 1524
1295sub find($) { 1525sub find($) {
1296 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1297 my $login = $_[0]; 1527 my $login = $_[0];
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1534 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1535 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1536 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1537 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1538
1309 my $pl = load_pl path $login 1539 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1540 or return;
1541
1542 my $pl = cf::player::load_pl $f
1543 or return;
1544
1545 local $cf::PLAYER_LOADING{$login} = $pl;
1546 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1312 } 1548 }
1313 } 1549 }
1314} 1550}
1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1315 1564
1316sub save($) { 1565sub save($) {
1317 my ($pl) = @_; 1566 my ($pl) = @_;
1318 1567
1319 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1323 1572
1324 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1325 1574
1326 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1328 1582
1329 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1584 cf::cede_to_tick;
1331} 1585}
1332 1586
1364 my ($pl) = @_; 1618 my ($pl) = @_;
1365 1619
1366 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1367 1621
1368 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1369 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1370 1624
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1375 1631
1376 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1413 or return []; 1669 or return [];
1414 1670
1415 my @logins; 1671 my @logins;
1416 1672
1417 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1674 my $path = path $login;
1675
1676 # a .pst is a dead give-away for a valid player
1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1682 }
1421 1683
1422 utf8::decode $login; 1684 utf8::decode $login;
1423 push @logins, $login; 1685 push @logins, $login;
1424 } 1686 }
1425 1687
1452 } 1714 }
1453 1715
1454 \@paths 1716 \@paths
1455} 1717}
1456 1718
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1458 1720
1459Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1
1480 }ge
1481 # replace H<hint text>
1482 || s{H<([^\>]*)>}
1483 {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "")
1487 [$self->{hintmode}]
1488 }ge;
1489
1490 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g;
1492
1493 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1498
1499 $_
1500}
1501
1502sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode}
1505}
1506 1722
1507=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1508 1724
1509Sends an ext reply to the player. 1725Sends an ext reply to the player.
1510 1726
1577our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1579 1795
1580sub generate_random_map { 1796sub generate_random_map {
1581 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1582 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1802 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1587 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1588 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1589 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1590 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1708 1927
1709# the temporary/swap location 1928# the temporary/swap location
1710sub save_path { 1929sub save_path {
1711 my ($self) = @_; 1930 my ($self) = @_;
1712 1931
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1715} 1934}
1716 1935
1717# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1718sub uniq_path { 1937sub uniq_path {
1719 my ($self) = @_; 1938 my ($self) = @_;
1720 1939
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1723}
1724
1725# and all this just because we cannot iterate over
1726# all maps in C++...
1727sub change_all_map_light {
1728 my ($change) = @_;
1729
1730 $_->change_map_light ($change)
1731 for grep $_->outdoor, values %cf::MAP;
1732} 1942}
1733 1943
1734sub decay_objects { 1944sub decay_objects {
1735 my ($self) = @_; 1945 my ($self) = @_;
1736 1946
1749 1959
1750sub load_header_from($) { 1960sub load_header_from($) {
1751 my ($self, $path) = @_; 1961 my ($self, $path) = @_;
1752 1962
1753 utf8::encode $path; 1963 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1964 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1965 or return;
1966
1967 $self->_load_header ($f)
1968 or return;
1969
1970 local $MAP_LOADING{$self->{path}} = $self;
1971 $f->resolve_delayed_derefs;
1759 1972
1760 $self->{load_path} = $path; 1973 $self->{load_path} = $path;
1761 1974
1762 1 1975 1
1763} 1976}
1817sub find { 2030sub find {
1818 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1819 2032
1820 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1821 2034
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1823 2037
1824 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1827 or return; 2040 or return;
1828 2041
1829 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1830 2043
1832 or return; 2045 or return;
1833 2046
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2051 undef $guard1;
1837 $map->reset; 2052 $map->reset;
1838 undef $guard;
1839 return find $path; 2053 return find $path;
1840 } 2054 }
1841 2055
1842 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1843 } 2057 }
1844} 2058}
1845 2059
1846sub pre_load { } 2060sub pre_load { }
1847sub post_load { } 2061#sub post_load { } # XS
1848 2062
1849sub load { 2063sub load {
1850 my ($self) = @_; 2064 my ($self) = @_;
1851 2065
1852 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1853 2067
1854 my $path = $self->{path}; 2068 my $path = $self->{path};
1855 2069
1856 { 2070 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2072
2073 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2075
1862 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1863 2077
1864 $self->alloc; 2078 $self->alloc;
1865 2079
1866 $self->pre_load; 2080 $self->pre_load;
1867 cf::cede_to_tick; 2081 cf::cede_to_tick;
1868 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1870 or return; 2086 or return;
1871 2087
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
1873 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1874 2090
1875 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2092 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2095 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1880 } 2099 }
1881 } 2100 }
2101
2102 $f->resolve_delayed_derefs;
1882 2103
1883 cf::cede_to_tick; 2104 cf::cede_to_tick;
1884 # now do the right thing for maps 2105 # now do the right thing for maps
1885 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1890 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1891 $self->decay_objects; 2112 $self->decay_objects;
1892 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1893 $self->update_buttons; 2114 $self->update_buttons;
1894 cf::cede_to_tick; 2115 cf::cede_to_tick;
1895 $self->set_darkness_map;
1896 cf::cede_to_tick;
1897 $self->activate; 2116 $self->activate;
1898 } 2117 }
1899 2118
1900 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1902 2121
1903 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1904 } 2123 }
1905 2124
1906 $self->post_load; 2125 $self->post_load;
1907} 2126}
1908 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
1909sub customise_for { 2131sub customise_for {
1910 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
1911 2133
1912 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
1913 if $self->per_player; 2135 if $self->per_player;
1966 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
1967 2189
1968 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
1969 2191
1970 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1972 } 2194 }
1973 2195
1974 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
1975 2197
1976 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2199 $Coro::current->{desc} = "map prefetcher";
2200
1977 while (%MAP_PREFETCH) { 2201 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2202 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2203 if (my $map = find $k) {
1980 $map->load if $v; 2204 $map->load if $v;
1981 } 2205 }
2007 return if $self->{deny_save}; 2231 return if $self->{deny_save};
2008 2232
2009 local $self->{last_access} = $self->last_access;#d# 2233 local $self->{last_access} = $self->last_access;#d#
2010 2234
2011 cf::async { 2235 cf::async {
2236 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2237 $_->contr->save for $self->players;
2013 }; 2238 };
2239
2240 cf::get_slot 0.02;
2014 2241
2015 if ($uniq) { 2242 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2244 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2245 } else {
2027 $self->save; 2254 $self->save;
2028 2255
2029 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2257
2031 return if $self->players; 2258 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2259 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2260 return if $self->{deny_save};
2034 2261
2262 $self->in_memory (cf::MAP_SWAPPED);
2263
2264 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2266 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2267}
2038 2268
2039sub reset_at { 2269sub reset_at {
2040 my ($self) = @_; 2270 my ($self) = @_;
2041 2271
2059 2289
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2291
2062 return if $self->players; 2292 return if $self->players;
2063 2293
2064 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2065 2295
2066 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2067 2297
2068 # need to save uniques path 2298 # need to save uniques path
2069 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2073 if $uniq; 2303 if $uniq;
2074 } 2304 }
2075 2305
2076 delete $cf::MAP{$self->path}; 2306 delete $cf::MAP{$self->path};
2077 2307
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2310 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2311
2082 $self->unlink_save; 2312 $self->unlink_save;
2083 $self->destroy; 2313 $self->destroy;
2084} 2314}
2085 2315
2090 2320
2091 { 2321 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093 2323
2094 delete $cf::MAP{$self->path}; 2324 delete $cf::MAP{$self->path};
2325
2326 $self->unlink_save;
2095 2327
2096 bless $self, "cf::map"; 2328 bless $self, "cf::map";
2097 delete $self->{deny_reset}; 2329 delete $self->{deny_reset};
2098 $self->{deny_save} = 1; 2330 $self->{deny_save} = 1;
2099 $self->reset_timeout (1); 2331 $self->reset_timeout (1);
2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103 2333
2104 $cf::MAP{$self->path} = $self; 2334 $cf::MAP{$self->path} = $self;
2105 } 2335 }
2106 2336
2107 $self->reset; # polite request, might not happen 2337 $self->reset; # polite request, might not happen
2152 2382
2153sub unique_maps() { 2383sub unique_maps() {
2154 [ 2384 [
2155 map { 2385 map {
2156 utf8::decode $_; 2386 utf8::decode $_;
2157 /\.map$/ 2387 s/\.map$//; # TODO future compatibility hack
2388 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2389 ? ()
2158 ? normalise $_ 2390 : normalise $_
2159 : ()
2160 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2161 ] 2392 ]
2162} 2393}
2163 2394
2164package cf; 2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2165 2426
2166=back 2427=back
2167 2428
2168=head3 cf::object 2429=head3 cf::object
2169 2430
2173 2434
2174=over 4 2435=over 4
2175 2436
2176=item $ob->inv_recursive 2437=item $ob->inv_recursive
2177 2438
2178Returns the inventory of the object _and_ their inventories, recursively. 2439Returns the inventory of the object I<and> their inventories, recursively,
2440but I<not> the object itself.
2179 2441
2180=cut 2442=cut
2181 2443
2182sub inv_recursive_; 2444sub inv_recursive_;
2183sub inv_recursive_ { 2445sub inv_recursive_ {
2186 2448
2187sub inv_recursive { 2449sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2450 inv_recursive_ inv $_[0]
2189} 2451}
2190 2452
2453=item $ref = $ob->ref
2454
2455Creates and returns a persistent reference to an object that can be stored as a string.
2456
2457=item $ob = cf::object::deref ($refstring)
2458
2459returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2460even if the object actually exists. May block.
2461
2462=cut
2463
2464sub deref {
2465 my ($ref) = @_;
2466
2467 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2468 my ($uuid, $name) = ($1, $2);
2469 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2470 or return;
2471 $pl->ob->uuid eq $uuid
2472 or return;
2473
2474 $pl->ob
2475 } else {
2476 warn "$ref: cannot resolve object reference\n";
2477 undef
2478 }
2479}
2480
2191package cf; 2481package cf;
2192 2482
2193=back 2483=back
2194 2484
2195=head3 cf::object::player 2485=head3 cf::object::player
2201Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2491Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2202can be C<undef>. Does the right thing when the player is currently in a 2492can be C<undef>. Does the right thing when the player is currently in a
2203dialogue with the given NPC character. 2493dialogue with the given NPC character.
2204 2494
2205=cut 2495=cut
2496
2497our $SAY_CHANNEL = {
2498 id => "say",
2499 title => "Map",
2500 reply => "say ",
2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2502};
2503
2504our $CHAT_CHANNEL = {
2505 id => "chat",
2506 title => "Chat",
2507 reply => "chat ",
2508 tooltip => "Player chat and shouts, global to the server.",
2509};
2206 2510
2207# rough implementation of a future "reply" method that works 2511# rough implementation of a future "reply" method that works
2208# with dialog boxes. 2512# with dialog boxes.
2209#TODO: the first argument must go, split into a $npc->reply_to ( method 2513#TODO: the first argument must go, split into a $npc->reply_to ( method
2210sub cf::object::player::reply($$$;$) { 2514sub cf::object::player::reply($$$;$) {
2222 my $dialog = $pl->{npc_dialog}; 2526 my $dialog = $pl->{npc_dialog};
2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2527 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2224 2528
2225 } else { 2529 } else {
2226 $msg = $npc->name . " says: $msg" if $npc; 2530 $msg = $npc->name . " says: $msg" if $npc;
2227 $self->message ($msg, $flags); 2531 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2228 } 2532 }
2229 } 2533 }
2230} 2534}
2231 2535
2232=item $object->send_msg ($channel, $msg, $color, [extra...]) 2536=item $object->send_msg ($channel, $msg, $color, [extra...])
2257 2561
2258=item $player_object->enter_link 2562=item $player_object->enter_link
2259 2563
2260Freezes the player and moves him/her to a special map (C<{link}>). 2564Freezes the player and moves him/her to a special map (C<{link}>).
2261 2565
2262The player should be reasonably safe there for short amounts of time. You 2566The player should be reasonably safe there for short amounts of time (e.g.
2263I<MUST> call C<leave_link> as soon as possible, though. 2567for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link
2569map.
2264 2570
2265Will never block. 2571Will never block.
2266 2572
2267=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2268 2574
2320 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2321 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2322 2628
2323 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2324 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2325 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2326 2632
2327 $map->load; 2633 $map->load;
2328 $map->load_neighbours; 2634 $map->load_neighbours;
2329 2635
2330 return unless $self->contr->active; 2636 return unless $self->contr->active;
2331 $self->activate_recursive;
2332 2637
2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2334 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2335} 2643}
2336 2644
2337=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2338 2646
2339Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2340her, loading and preparing them map, calling the provided $check callback 2648her, loading and preparing them map, calling the provided $check callback
2341that has to return the map if sucecssful, and then unfreezes the player on 2649that has to return the map if sucecssful, and then unfreezes the player on
2342the new (success) or old (failed) map position. In either case, $done will 2650the new (success) or old (failed) map position. In either case, $done will
2343be called at the end of this process. 2651be called at the end of this process.
2344 2652
2653Note that $check will be called with a potentially non-loaded map, so if
2654it needs a loaded map it has to call C<< ->load >>.
2655
2345=cut 2656=cut
2346 2657
2347our $GOTOGEN; 2658our $GOTOGEN;
2348 2659
2349sub cf::object::player::goto { 2660sub cf::object::player::goto {
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2665
2355 $self->enter_link; 2666 $self->enter_link;
2356 2667
2357 (async { 2668 (async {
2669 $Coro::current->{desc} = "player::goto $path $x $y";
2670
2671 # *tag paths override both path and x|y
2672 if ($path =~ /^\*(.*)$/) {
2673 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2674 my $ob = $obs[rand @obs];
2675
2676 # see if we actually can go there
2677 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2678 $ob = $obs[rand @obs];
2679 } else {
2680 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2681 }
2682 # else put us there anyways for now #d#
2683
2684 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2685 } else {
2686 ($path, $x, $y) = (undef, undef, undef);
2687 }
2688 }
2689
2358 my $map = eval { 2690 my $map = eval {
2359 my $map = cf::map::find $path; 2691 my $map = defined $path ? cf::map::find $path : undef;
2360 2692
2361 if ($map) { 2693 if ($map) {
2362 $map = $map->customise_for ($self); 2694 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2695 $map = $check->($map) if $check && $map;
2364 } else { 2696 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2366 } 2698 }
2367 2699
2368 $map 2700 $map
2369 }; 2701 };
2370 2702
2406} 2738}
2407 2739
2408sub prepare_random_map { 2740sub prepare_random_map {
2409 my ($exit) = @_; 2741 my ($exit) = @_;
2410 2742
2411 my $guard = cf::lock_acquire "exit_prepare:$exit";
2412
2413 # all this does is basically replace the /! path by 2743 # all this does is basically replace the /! path by
2414 # a new random map path (?random/...) with a seed 2744 # a new random map path (?random/...) with a seed
2415 # that depends on the exit object 2745 # that depends on the exit object
2416 2746
2417 my $rmp = parse_random_map_params $exit->msg; 2747 my $rmp = parse_random_map_params $exit->msg;
2419 if ($exit->map) { 2749 if ($exit->map) {
2420 $rmp->{region} = $exit->region->name; 2750 $rmp->{region} = $exit->region->name;
2421 $rmp->{origin_map} = $exit->map->path; 2751 $rmp->{origin_map} = $exit->map->path;
2422 $rmp->{origin_x} = $exit->x; 2752 $rmp->{origin_x} = $exit->x;
2423 $rmp->{origin_y} = $exit->y; 2753 $rmp->{origin_y} = $exit->y;
2754
2755 $exit->map->touch;
2424 } 2756 }
2425 2757
2426 $rmp->{random_seed} ||= $exit->random_seed; 2758 $rmp->{random_seed} ||= $exit->random_seed;
2427 2759
2428 my $data = cf::to_json $rmp; 2760 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2429 my $md5 = Digest::MD5::md5_hex $data; 2761 my $md5 = Digest::MD5::md5_hex $data;
2430 my $meta = "$RANDOMDIR/$md5.meta"; 2762 my $meta = "$RANDOMDIR/$md5.meta";
2431 2763
2432 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2764 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2433 aio_write $fh, 0, (length $data), $data, 0; 2765 aio_write $fh, 0, (length $data), $data, 0;
2434 undef $fh; 2766 undef $fh;
2435 aio_rename "$meta~", $meta; 2767 aio_rename "$meta~", $meta;
2436 2768
2769 my $slaying = "?random/$md5";
2770
2771 if ($exit->valid) {
2437 $exit->slaying ("?random/$md5"); 2772 $exit->slaying ("?random/$md5");
2438 $exit->msg (undef); 2773 $exit->msg (undef);
2774 }
2439 } 2775 }
2440} 2776}
2441 2777
2442sub cf::object::player::enter_exit { 2778sub cf::object::player::enter_exit {
2443 my ($self, $exit) = @_; 2779 my ($self, $exit) = @_;
2444 2780
2445 return unless $self->type == cf::PLAYER; 2781 return unless $self->type == cf::PLAYER;
2446 2782
2447 if ($exit->slaying eq "/!") {
2448 #TODO: this should de-fi-ni-te-ly not be a sync-job
2449 # the problem is that $exit might not survive long enough
2450 # so it needs to be done right now, right here
2451 cf::sync_job { prepare_random_map $exit };
2452 }
2453
2454 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2455 my $hp = $exit->stats->hp;
2456 my $sp = $exit->stats->sp;
2457
2458 $self->enter_link; 2783 $self->enter_link;
2459 2784
2460 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED);
2463
2464 (async { 2785 (async {
2465 $self->deactivate_recursive; # just to be sure 2786 $Coro::current->{desc} = "enter_exit";
2787
2466 unless (eval { 2788 unless (eval {
2789 $self->deactivate_recursive; # just to be sure
2790
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2800 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp;
2802
2467 $self->goto ($slaying, $hp, $sp); 2803 $self->goto ($map, $x, $y);
2468 2804
2805 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y)
2807 if $exit->flag (cf::FLAG_DAMNED);
2808
2469 1; 2809 1
2470 }) { 2810 }) {
2471 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2472 . "I'll try to bring you back to the map you were before. " 2812 . "I'll try to bring you back to the map you were before. "
2473 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2474 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2475 2815
2476 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
2493sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2494 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2495 2835
2496 utf8::encode $text; 2836 utf8::encode $text;
2497 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2498} 2863}
2499 2864
2500=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2501 2866
2502Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2504the message, with C<log> being the default. If C<$color> is negative, suppress 2869the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet. 2870the message unless the client supports the msg packet.
2506 2871
2507=cut 2872=cut
2508 2873
2874# non-persistent channels (usually the info channel)
2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2882 "c/identify" => {
2883 id => "infobox",
2884 title => "Identify",
2885 reply => undef,
2886 tooltip => "Items recently identified",
2887 },
2888 "c/examine" => {
2889 id => "infobox",
2890 title => "Examine",
2891 reply => undef,
2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2899 },
2900 "c/book" => {
2901 id => "infobox",
2902 title => "Book",
2903 reply => undef,
2904 tooltip => "The contents of a note or book",
2905 },
2906 "c/lookat" => {
2907 id => "infobox",
2908 title => "Look",
2909 reply => undef,
2910 tooltip => "What you saw there",
2911 },
2912 "c/who" => {
2913 id => "infobox",
2914 title => "Players",
2915 reply => undef,
2916 tooltip => "Shows players who are currently online",
2917 },
2918 "c/body" => {
2919 id => "infobox",
2920 title => "Body Parts",
2921 reply => undef,
2922 tooltip => "Shows which body parts you posess and are available",
2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2960 "c/uptime" => {
2961 id => "infobox",
2962 title => "Uptime",
2963 reply => undef,
2964 tooltip => "How long the server has been running since last restart",
2965 },
2966 "c/mapinfo" => {
2967 id => "infobox",
2968 title => "Map Info",
2969 reply => undef,
2970 tooltip => "Information related to the maps",
2971 },
2972 "c/party" => {
2973 id => "party",
2974 title => "Party",
2975 reply => "gsay ",
2976 tooltip => "Messages and chat related to your party",
2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2986);
2987
2509sub cf::client::send_msg { 2988sub cf::client::send_msg {
2510 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2511 2990
2512 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2513 2993
2514 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515 2995
2996 # check predefined channels, for the benefit of C
2997 if ($CHANNEL{$channel}) {
2998 $channel = $CHANNEL{$channel};
2999
3000 $self->ext_msg (channel_info => $channel);
3001 $channel = $channel->{id};
3002
2516 if (ref $channel) { 3003 } elsif (ref $channel) {
2517 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel); 3007 $self->ext_msg (channel_info => $channel);
2521 } 3008 }
2523 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2524 } 3011 }
2525 3012
2526 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2527 3014
2528 if ($self->can_msg) {
2529 # default colour, mask it out 3015 # default colour, mask it out
2530 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2531 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2532 3018
2533 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2535 } else { 3022 );
2536 if ($color >= 0) {
2537 # replace some tags by gcfclient-compatible ones
2538 for ($msg) {
2539 1 while
2540 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2541 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2542 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2543 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2544 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2545 }
2546 3023
2547 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2548
2549 utf8::encode $msg;
2550
2551 if (0 && $msg =~ /\[/) {
2552 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg")
2557 }
2558 }
2559 }
2560} 3025}
2561 3026
2562=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2563 3028
2564Sends an ext event to the client. 3029Sends an ext event to the client.
2567 3032
2568sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2569 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2570 3035
2571 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2573 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2574 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 } 3041 }
2577} 3042}
2578 3043
2579=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2580 3045
2584 3049
2585sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2587 3052
2588 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove 3056 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2594 } 3059 }
2595} 3060}
2596 3061
2597=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2598 3063
2699 3164
2700 $coro 3165 $coro
2701} 3166}
2702 3167
2703cf::client->attach ( 3168cf::client->attach (
2704 on_destroy => sub { 3169 on_client_destroy => sub {
2705 my ($ns) = @_; 3170 my ($ns) = @_;
2706 3171
2707 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2708 }, 3173 },
2709); 3174);
2725our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
2726 3191
2727$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
2728 3193
2729$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
2730 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
2731 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
2732 sort time 3197 sort time
2733)); 3198));
2734 3199
2735# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
2737=pod 3202=pod
2738 3203
2739The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
2740 3205
2741 cf::object 3206 cf::object
2742 contr pay_amount pay_player map x y force_find force_add 3207 contr pay_amount pay_player map x y force_find force_add destroy
2743 insert remove name archname title slaying race decrease_ob_nr 3208 insert remove name archname title slaying race decrease split
3209 value
2744 3210
2745 cf::object::player 3211 cf::object::player
2746 player 3212 player
2747 3213
2748 cf::player 3214 cf::player
2753 3219
2754=cut 3220=cut
2755 3221
2756for ( 3222for (
2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
2759 decrease_ob_nr)], 3225 decrease split destroy change_exp value msg lore send_msg)],
2760 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
2761 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
2762 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
2763) { 3229) {
2764 no strict 'refs'; 3230 no strict 'refs';
2765 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
2766 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2784 3250
2785 my $qcode = $code; 3251 my $qcode = $code;
2786 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2787 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
2788 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
2789 local $_; 3258 local $_;
2790 local @safe::cf::_safe_eval_args = values %vars;
2791 3259
2792 my $eval = 3260 my $eval =
2793 "do {\n" 3261 "do {\n"
2794 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2795 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
2796 . $code 3264 . $code
2797 . "\n}" 3265 . "\n}"
2798 ; 3266 ;
2799 3267
3268 if ($CFG{safe_eval}) {
2800 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
2801 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2802 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
2803 3277
2804 if ($@) { 3278 if ($@) {
2805 warn "$@"; 3279 warn "$@";
2806 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
2807 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
2826=cut 3300=cut
2827 3301
2828sub register_script_function { 3302sub register_script_function {
2829 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
2830 3304
2831 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
2832 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
2833} 3307}
2834 3308
2835=back 3309=back
2836 3310
2837=cut 3311=cut
2858 3332
2859 $facedata->{version} == 2 3333 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
2861 3335
2862 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2863 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
2864 type => FT_RSRC, 3339 type => FT_RSRC,
2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
2866 }; 3342 };
2867 cf::cede_to_tick; 3343 cf::cede_to_tick;
2868 3344
2869 { 3345 {
2870 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
2871 3347
2872 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
2873 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350
2874 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
2875 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2878 3355
2879 cf::cede_to_tick; 3356 cf::cede_to_tick;
2880 } 3357 }
2881 3358
2882 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
2883 next unless $info->{smooth}; 3360 next unless $info->{smooth};
3361
2884 my $idx = cf::face::find $face 3362 my $idx = cf::face::find $face
2885 or next; 3363 or next;
3364
2886 if (my $smooth = cf::face::find $info->{smooth}) { 3365 if (my $smooth = cf::face::find $info->{smooth}) {
2887 cf::face::set_smooth $idx, $smooth; 3366 cf::face::set_smooth $idx, $smooth;
2888 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2889 } else { 3368 } else {
2890 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3369 warn "smooth face '$info->{smooth}' not found for face '$face'";
2904 3383
2905 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
2906 } 3385 }
2907 3386
2908 { 3387 {
2909 # TODO: for gcfclient pleasure, we should give resources
2910 # that gcfclient doesn't grok a >10000 face index.
2911 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
2912 3389
2913 my $soundconf = delete $res->{"res/sound.conf"};
2914
2915 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3391 if (defined $info->{type}) {
2916 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2918 3393
2919 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2920 # prepend meta info 3395 cf::face::set_type $idx, $info->{type};
2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2927 $data = pack "(w/a*)*", $meta, $info->{data};
2928 } else { 3396 } else {
2929 $data = $info->{data}; 3397 $RESOURCE{$name} = $info;
2930 } 3398 }
2931 3399
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2935 cf::cede_to_tick; 3400 cf::cede_to_tick;
2936 } 3401 }
2937
2938 if ($soundconf) {
2939 $soundconf = $enc->decode (delete $soundconf->{data});
2940
2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2942 my $sound = $soundconf->{compat}[$_]
2943 or next;
2944
2945 my $face = cf::face::find "sound/$sound->[1]";
2946 cf::sound::set $sound->[0] => $face;
2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2948 }
2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2953 }
2954 }
2955 } 3402 }
3403
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2956 3405
2957 1 3406 1
2958} 3407}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
2959 3428
2960register_exticmd fx_want => sub { 3429register_exticmd fx_want => sub {
2961 my ($ns, $want) = @_; 3430 my ($ns, $want) = @_;
2962 3431
2963 while (my ($k, $v) = each %$want) { 3432 while (my ($k, $v) = each %$want) {
2964 $ns->fx_want ($k, $v); 3433 $ns->fx_want ($k, $v);
2965 } 3434 }
2966}; 3435};
3436
3437sub load_resource_file($) {
3438 my $guard = lock_acquire "load_resource_file";
3439
3440 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100;
3442 cf::arch::commit_load;
3443
3444 $status
3445}
2967 3446
2968sub reload_regions { 3447sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework 3448 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?) 3449 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = (); 3450 %ext::player_env::MUSIC_FACE_CACHE = ();
2985} 3464}
2986 3465
2987sub reload_archetypes { 3466sub reload_archetypes {
2988 load_resource_file "$DATADIR/archetypes" 3467 load_resource_file "$DATADIR/archetypes"
2989 or die "unable to load archetypes\n"; 3468 or die "unable to load archetypes\n";
2990 #d# NEED to laod twice to resolve forward references
2991 # this really needs to be done in an extra post-pass
2992 # (which needs to be synchronous, so solve it differently)
2993 load_resource_file "$DATADIR/archetypes"
2994 or die "unable to load archetypes\n";
2995} 3469}
2996 3470
2997sub reload_treasures { 3471sub reload_treasures {
2998 load_resource_file "$DATADIR/treasures" 3472 load_resource_file "$DATADIR/treasures"
2999 or die "unable to load treasurelists\n"; 3473 or die "unable to load treasurelists\n";
3000} 3474}
3001 3475
3002sub reload_resources { 3476sub reload_resources {
3003 warn "reloading resource files...\n"; 3477 warn "reloading resource files...\n";
3004 3478
3479 reload_facedata;
3480 reload_archetypes;
3005 reload_regions; 3481 reload_regions;
3006 reload_facedata;
3007 #reload_archetypes;#d#
3008 reload_archetypes;
3009 reload_treasures; 3482 reload_treasures;
3010 3483
3011 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3012} 3485}
3013 3486
3014sub init {
3015 reload_resources;
3016}
3017
3018sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3019 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3020 or return; 3491 or return;
3021 3492
3022 local $/; 3493 local $/;
3023 *CFG = YAML::Syck::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3024 3495
3025 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3026 3497
3027 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3028 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3032 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3033 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3034 }; 3505 };
3035 warn $@ if $@; 3506 warn $@ if $@;
3036 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3510}
3511
3512sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!";
3515 flock $fh, &Fcntl::LOCK_EX
3516 or die "$PIDFILE: flock: $!";
3517 $fh
3518}
3519
3520# make sure only one server instance is running at any one time
3521sub atomic {
3522 my $fh = pidfile;
3523
3524 my $pid = <$fh>;
3525 kill 9, $pid if $pid > 0;
3526
3527 seek $fh, 0, 0;
3528 print $fh $$;
3529}
3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3037} 3538}
3038 3539
3039sub main { 3540sub main {
3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549
3040 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3041 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3042 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3043 (async { 3553 (async {
3044 Event::one_event; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3555 EV::loop EV::LOOP_ONESHOT;
3045 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3046 }; 3557 };
3047 3558
3559 evthread_start IO::AIO::poll_fileno;
3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3048 reload_config; 3571 reload_config;
3049 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3050 load_extensions; 3582 load_extensions;
3051 3583
3052 $TICK_WATCHER->start; 3584 utime time, time, $RUNTIMEFILE;
3053 Event::loop; 3585
3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589
3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 cf::object::thawer::errors_are_fatal 0;
3594
3595 main_loop;
3054} 3596}
3055 3597
3056############################################################################# 3598#############################################################################
3057# initialisation and cleanup 3599# initialisation and cleanup
3058 3600
3059# install some emergency cleanup handlers 3601# install some emergency cleanup handlers
3060BEGIN { 3602BEGIN {
3603 our %SIGWATCHER = ();
3061 for my $signal (qw(INT HUP TERM)) { 3604 for my $signal (qw(INT HUP TERM)) {
3062 Event->signal ( 3605 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3063 reentrant => 0,
3064 data => WF_AUTOCANCEL,
3065 signal => $signal,
3066 prio => 0,
3067 cb => sub {
3068 cf::cleanup "SIG$signal"; 3606 cf::cleanup "SIG$signal";
3069 },
3070 ); 3607 };
3071 } 3608 }
3072} 3609}
3073 3610
3074sub write_runtime { 3611sub write_runtime_sync {
3075 my $runtime = "$LOCALDIR/runtime"; 3612 my $t0 = AE::time;
3076 3613
3077 # first touch the runtime file to show we are still running: 3614 # first touch the runtime file to show we are still running:
3078 # the fsync below can take a very very long time. 3615 # the fsync below can take a very very long time.
3079 3616
3080 IO::AIO::aio_utime $runtime, undef, undef; 3617 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3081 3618
3082 my $guard = cf::lock_acquire "write_runtime"; 3619 my $guard = cf::lock_acquire "write_runtime";
3083 3620
3084 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3621 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3085 or return; 3622 or return;
3086 3623
3087 my $value = $cf::RUNTIME + 90 + 10; 3624 my $value = $cf::RUNTIME + 90 + 10;
3088 # 10 is the runtime save interval, for a monotonic clock 3625 # 10 is the runtime save interval, for a monotonic clock
3089 # 60 allows for the watchdog to kill the server. 3626 # 60 allows for the watchdog to kill the server.
3099 aio_utime $fh, undef, undef; 3636 aio_utime $fh, undef, undef;
3100 3637
3101 close $fh 3638 close $fh
3102 or return; 3639 or return;
3103 3640
3104 aio_rename "$runtime~", $runtime 3641 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3105 and return; 3642 and return;
3106 3643
3107 warn "runtime file written.\n"; 3644 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3108 3645
3109 1 3646 1
3647}
3648
3649our $uuid_lock;
3650our $uuid_skip;
3651
3652sub write_uuid_sync($) {
3653 $uuid_skip ||= $_[0];
3654
3655 return if $uuid_lock;
3656 local $uuid_lock = 1;
3657
3658 my $uuid = "$LOCALDIR/uuid";
3659
3660 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3661 or return;
3662
3663 my $value = uuid_seq uuid_cur;
3664
3665 unless ($value) {
3666 warn "cowardly refusing to write zero uuid value!\n";
3667 return;
3668 }
3669
3670 my $value = uuid_str $value + $uuid_skip;
3671 $uuid_skip = 0;
3672
3673 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3674 and return;
3675
3676 # always fsync - this file is important
3677 aio_fsync $fh
3678 and return;
3679
3680 close $fh
3681 or return;
3682
3683 aio_rename "$uuid~", $uuid
3684 and return;
3685
3686 warn "uuid file written ($value).\n";
3687
3688 1
3689
3690}
3691
3692sub write_uuid($$) {
3693 my ($skip, $sync) = @_;
3694
3695 $sync ? write_uuid_sync $skip
3696 : async { write_uuid_sync $skip };
3110} 3697}
3111 3698
3112sub emergency_save() { 3699sub emergency_save() {
3113 my $freeze_guard = cf::freeze_mainloop; 3700 my $freeze_guard = cf::freeze_mainloop;
3114 3701
3115 warn "enter emergency perl save\n"; 3702 warn "emergency_perl_save: enter\n";
3116 3703
3117 cf::sync_job { 3704 cf::sync_job {
3705 # this is a trade-off: we want to be very quick here, so
3706 # save all maps without fsync, and later call a global sync
3707 # (which in turn might be very very slow)
3708 local $USE_FSYNC = 0;
3709
3118 # use a peculiar iteration method to avoid tripping on perl 3710 # use a peculiar iteration method to avoid tripping on perl
3119 # refcount bugs in for. also avoids problems with players 3711 # refcount bugs in for. also avoids problems with players
3120 # and maps saved/destroyed asynchronously. 3712 # and maps saved/destroyed asynchronously.
3121 warn "begin emergency player save\n"; 3713 warn "emergency_perl_save: begin player save\n";
3122 for my $login (keys %cf::PLAYER) { 3714 for my $login (keys %cf::PLAYER) {
3123 my $pl = $cf::PLAYER{$login} or next; 3715 my $pl = $cf::PLAYER{$login} or next;
3124 $pl->valid or next; 3716 $pl->valid or next;
3717 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3125 $pl->save; 3718 $pl->save;
3126 } 3719 }
3127 warn "end emergency player save\n"; 3720 warn "emergency_perl_save: end player save\n";
3128 3721
3129 warn "begin emergency map save\n"; 3722 warn "emergency_perl_save: begin map save\n";
3130 for my $path (keys %cf::MAP) { 3723 for my $path (keys %cf::MAP) {
3131 my $map = $cf::MAP{$path} or next; 3724 my $map = $cf::MAP{$path} or next;
3132 $map->valid or next; 3725 $map->valid or next;
3133 $map->save; 3726 $map->save;
3134 } 3727 }
3135 warn "end emergency map save\n"; 3728 warn "emergency_perl_save: end map save\n";
3136 3729
3137 warn "begin emergency database checkpoint\n"; 3730 warn "emergency_perl_save: begin database checkpoint\n";
3138 BDB::db_env_txn_checkpoint $DB_ENV; 3731 BDB::db_env_txn_checkpoint $DB_ENV;
3139 warn "end emergency database checkpoint\n"; 3732 warn "emergency_perl_save: end database checkpoint\n";
3733
3734 warn "emergency_perl_save: begin write uuid\n";
3735 write_uuid_sync 1;
3736 warn "emergency_perl_save: end write uuid\n";
3140 }; 3737 };
3141 3738
3739 warn "emergency_perl_save: starting sync()\n";
3740 IO::AIO::aio_sync sub {
3741 warn "emergency_perl_save: finished sync()\n";
3742 };
3743
3142 warn "leave emergency perl save\n"; 3744 warn "emergency_perl_save: leave\n";
3143} 3745}
3144 3746
3145sub post_cleanup { 3747sub post_cleanup {
3146 my ($make_core) = @_; 3748 my ($make_core) = @_;
3147 3749
3148 warn Carp::longmess "post_cleanup backtrace" 3750 warn Carp::longmess "post_cleanup backtrace"
3149 if $make_core; 3751 if $make_core;
3752
3753 my $fh = pidfile;
3754 unlink $PIDFILE if <$fh> == $$;
3755}
3756
3757# a safer delete_package, copied from Symbol
3758sub clear_package($) {
3759 my $pkg = shift;
3760
3761 # expand to full symbol table name if needed
3762 unless ($pkg =~ /^main::.*::$/) {
3763 $pkg = "main$pkg" if $pkg =~ /^::/;
3764 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3765 $pkg .= '::' unless $pkg =~ /::$/;
3766 }
3767
3768 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3769 my $stem_symtab = *{$stem}{HASH};
3770
3771 defined $stem_symtab and exists $stem_symtab->{$leaf}
3772 or return;
3773
3774 # clear all symbols
3775 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3776 for my $name (keys %$leaf_symtab) {
3777 _gv_clear *{"$pkg$name"};
3778# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3779 }
3780 warn "cleared package $pkg\n";#d#
3150} 3781}
3151 3782
3152sub do_reload_perl() { 3783sub do_reload_perl() {
3153 # can/must only be called in main 3784 # can/must only be called in main
3154 if ($Coro::current != $Coro::main) { 3785 if ($Coro::current != $Coro::main) {
3155 warn "can only reload from main coroutine"; 3786 warn "can only reload from main coroutine";
3156 return; 3787 return;
3157 } 3788 }
3158 3789
3790 return if $RELOAD++;
3791
3792 my $t1 = AE::time;
3793
3794 while ($RELOAD) {
3159 warn "reloading..."; 3795 warn "reloading...";
3160 3796
3161 warn "entering sync_job"; 3797 warn "entering sync_job";
3162 3798
3163 cf::sync_job { 3799 cf::sync_job {
3164 cf::write_runtime; # external watchdog should not bark 3800 cf::write_runtime_sync; # external watchdog should not bark
3165 cf::emergency_save; 3801 cf::emergency_save;
3166 cf::write_runtime; # external watchdog should not bark 3802 cf::write_runtime_sync; # external watchdog should not bark
3167 3803
3168 warn "syncing database to disk"; 3804 warn "syncing database to disk";
3169 BDB::db_env_txn_checkpoint $DB_ENV; 3805 BDB::db_env_txn_checkpoint $DB_ENV;
3170 3806
3171 # if anything goes wrong in here, we should simply crash as we already saved 3807 # if anything goes wrong in here, we should simply crash as we already saved
3172 3808
3173 warn "cancelling all WF_AUTOCANCEL watchers";
3174 for (Event::all_watchers) {
3175 $_->cancel if $_->data & WF_AUTOCANCEL;
3176 }
3177
3178 warn "flushing outstanding aio requests"; 3809 warn "flushing outstanding aio requests";
3179 for (;;) {
3180 BDB::flush;
3181 IO::AIO::flush;
3182 Coro::cede;
3183 last unless IO::AIO::nreqs || BDB::nreqs; 3810 while (IO::AIO::nreqs || BDB::nreqs) {
3184 warn "iterate..."; 3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3185 }
3186
3187 ++$RELOAD;
3188
3189 warn "cancelling all extension coros";
3190 $_->cancel for values %EXT_CORO;
3191 %EXT_CORO = ();
3192
3193 warn "removing commands";
3194 %COMMAND = ();
3195
3196 warn "removing ext/exti commands";
3197 %EXTCMD = ();
3198 %EXTICMD = ();
3199
3200 warn "unloading/nuking all extensions";
3201 for my $pkg (@EXTS) {
3202 warn "... unloading $pkg";
3203
3204 if (my $cb = $pkg->can ("unload")) {
3205 eval {
3206 $cb->($pkg);
3207 1
3208 } or warn "$pkg unloaded, but with errors: $@";
3209 } 3812 }
3210 3813
3211 warn "... nuking $pkg"; 3814 warn "cancelling all extension coros";
3212 Symbol::delete_package $pkg; 3815 $_->cancel for values %EXT_CORO;
3213 } 3816 %EXT_CORO = ();
3214 3817
3215 warn "unloading all perl modules loaded from $LIBDIR"; 3818 warn "removing commands";
3216 while (my ($k, $v) = each %INC) { 3819 %COMMAND = ();
3217 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3218 3820
3821 warn "removing ext/exti commands";
3822 %EXTCMD = ();
3823 %EXTICMD = ();
3824
3825 warn "unloading/nuking all extensions";
3826 for my $pkg (@EXTS) {
3219 warn "... unloading $k"; 3827 warn "... unloading $pkg";
3220 delete $INC{$k};
3221 3828
3222 $k =~ s/\.pm$//;
3223 $k =~ s/\//::/g;
3224
3225 if (my $cb = $k->can ("unload_module")) { 3829 if (my $cb = $pkg->can ("unload")) {
3830 eval {
3226 $cb->(); 3831 $cb->($pkg);
3832 1
3833 } or warn "$pkg unloaded, but with errors: $@";
3834 }
3835
3836 warn "... clearing $pkg";
3837 clear_package $pkg;
3227 } 3838 }
3228 3839
3229 Symbol::delete_package $k; 3840 warn "unloading all perl modules loaded from $LIBDIR";
3841 while (my ($k, $v) = each %INC) {
3842 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3843
3844 warn "... unloading $k";
3845 delete $INC{$k};
3846
3847 $k =~ s/\.pm$//;
3848 $k =~ s/\//::/g;
3849
3850 if (my $cb = $k->can ("unload_module")) {
3851 $cb->();
3852 }
3853
3854 clear_package $k;
3230 } 3855 }
3231 3856
3232 warn "getting rid of safe::, as good as possible"; 3857 warn "getting rid of safe::, as good as possible";
3233 Symbol::delete_package "safe::$_" 3858 clear_package "safe::$_"
3234 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3859 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3235 3860
3236 warn "unloading cf.pm \"a bit\""; 3861 warn "unloading cf.pm \"a bit\"";
3237 delete $INC{"cf.pm"}; 3862 delete $INC{"cf.pm"};
3238 delete $INC{"cf/pod.pm"}; 3863 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3239 3864
3240 # don't, removes xs symbols, too, 3865 # don't, removes xs symbols, too,
3241 # and global variables created in xs 3866 # and global variables created in xs
3242 #Symbol::delete_package __PACKAGE__; 3867 #clear_package __PACKAGE__;
3243 3868
3244 warn "unload completed, starting to reload now"; 3869 warn "unload completed, starting to reload now";
3245 3870
3246 warn "reloading cf.pm"; 3871 warn "reloading cf.pm";
3247 require cf; 3872 require cf;
3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3873 cf::_connect_to_perl_1;
3249 3874
3250 warn "loading config and database again"; 3875 warn "loading config and database again";
3251 cf::reload_config; 3876 cf::reload_config;
3252 3877
3253 warn "loading extensions"; 3878 warn "loading extensions";
3254 cf::load_extensions; 3879 cf::load_extensions;
3255 3880
3881 if ($REATTACH_ON_RELOAD) {
3256 warn "reattaching attachments to objects/players"; 3882 warn "reattaching attachments to objects/players";
3257 _global_reattach; # objects, sockets 3883 _global_reattach; # objects, sockets
3258 warn "reattaching attachments to maps"; 3884 warn "reattaching attachments to maps";
3259 reattach $_ for values %MAP; 3885 reattach $_ for values %MAP;
3260 warn "reattaching attachments to players"; 3886 warn "reattaching attachments to players";
3261 reattach $_ for values %PLAYER; 3887 reattach $_ for values %PLAYER;
3888 }
3262 3889
3890 warn "running post_init jobs";
3891 (pop @POST_INIT)->(1) while @POST_INIT;
3892
3263 warn "leaving sync_job"; 3893 warn "leaving sync_job";
3264 3894
3265 1 3895 1
3266 } or do { 3896 } or do {
3267 warn $@; 3897 warn $@;
3268 warn "error while reloading, exiting."; 3898 cf::cleanup "error while reloading, exiting.";
3269 exit 1;
3270 }; 3899 };
3271 3900
3272 warn "reloaded"; 3901 warn "reloaded";
3902 --$RELOAD;
3903 }
3904
3905 $t1 = AE::time - $t1;
3906 warn "reload completed in ${t1}s\n";
3273}; 3907};
3274 3908
3275our $RELOAD_WATCHER; # used only during reload 3909our $RELOAD_WATCHER; # used only during reload
3276 3910
3277sub reload_perl() { 3911sub reload_perl() {
3278 # doing reload synchronously and two reloads happen back-to-back, 3912 # doing reload synchronously and two reloads happen back-to-back,
3279 # coro crashes during coro_state_free->destroy here. 3913 # coro crashes during coro_state_free->destroy here.
3280 3914
3281 $RELOAD_WATCHER ||= Event->timer ( 3915 $RELOAD_WATCHER ||= cf::async {
3282 reentrant => 0, 3916 Coro::AIO::aio_wait cache_extensions;
3283 after => 0, 3917
3284 data => WF_AUTOCANCEL, 3918 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3285 cb => sub {
3286 do_reload_perl; 3919 do_reload_perl;
3287 undef $RELOAD_WATCHER; 3920 undef $RELOAD_WATCHER;
3288 }, 3921 };
3289 ); 3922 };
3290} 3923}
3291 3924
3292register_command "reload" => sub { 3925register_command "reload" => sub {
3293 my ($who, $arg) = @_; 3926 my ($who, $arg) = @_;
3294 3927
3295 if ($who->flag (FLAG_WIZ)) { 3928 if ($who->flag (FLAG_WIZ)) {
3296 $who->message ("reloading server."); 3929 $who->message ("reloading server.");
3930 async {
3931 $Coro::current->{desc} = "perl_reload";
3297 async { reload_perl }; 3932 reload_perl;
3933 };
3298 } 3934 }
3299}; 3935};
3300 3936
3301unshift @INC, $LIBDIR; 3937unshift @INC, $LIBDIR;
3302 3938
3304 3940
3305our @WAIT_FOR_TICK; 3941our @WAIT_FOR_TICK;
3306our @WAIT_FOR_TICK_BEGIN; 3942our @WAIT_FOR_TICK_BEGIN;
3307 3943
3308sub wait_for_tick { 3944sub wait_for_tick {
3309 return unless $TICK_WATCHER->is_active;
3310 return if $Coro::current == $Coro::main; 3945 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3311 3946
3312 my $signal = new Coro::Signal; 3947 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK, $signal; 3948 push @WAIT_FOR_TICK, $signal;
3314 $signal->wait; 3949 $signal->wait;
3315} 3950}
3316 3951
3317sub wait_for_tick_begin { 3952sub wait_for_tick_begin {
3318 return unless $TICK_WATCHER->is_active;
3319 return if $Coro::current == $Coro::main; 3953 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3320 3954
3321 my $signal = new Coro::Signal; 3955 my $signal = new Coro::Signal;
3322 push @WAIT_FOR_TICK_BEGIN, $signal; 3956 push @WAIT_FOR_TICK_BEGIN, $signal;
3323 $signal->wait; 3957 $signal->wait;
3324} 3958}
3325 3959
3326 my $min = 1e6;#d# 3960sub tick {
3327 my $avg = 10;
3328$TICK_WATCHER = Event->timer (
3329 reentrant => 0,
3330 parked => 1,
3331 prio => 0,
3332 at => $NEXT_TICK || $TICK,
3333 data => WF_AUTOCANCEL,
3334 cb => sub {
3335 if ($Coro::current != $Coro::main) { 3961 if ($Coro::current != $Coro::main) {
3336 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3962 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3337 unless ++$bug_warning > 10; 3963 unless ++$bug_warning > 10;
3338 return; 3964 return;
3339 } 3965 }
3340 3966
3341 $NOW = $tick_start = Event::time;
3342
3343 cf::server_tick; # one server iteration 3967 cf::server_tick; # one server iteration
3344 3968
3345 0 && sync_job {#d# 3969 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3346 for(1..10) {
3347 my $t = Event::time;
3348 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3349 or die;
3350 3970
3351 $map->width (50); 3971 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3352 $map->height (50); 3972 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3353 $map->alloc; 3973 Coro::async_pool {
3354 $map->_load_objects ("/tmp/x.map", 1); 3974 $Coro::current->{desc} = "runtime saver";
3355 my $t = Event::time - $t; 3975 write_runtime_sync
3356 3976 or warn "ERROR: unable to write runtime file: $!";
3357 #next unless $t < 0.0013;#d#
3358 if ($t < $min) {
3359 $min = $t;
3360 }
3361 $avg = $avg * 0.99 + $t * 0.01;
3362 }
3363 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3364 exit 0;
3365 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3366 }; 3977 };
3978 }
3367 3979
3368 $RUNTIME += $TICK;
3369 $NEXT_TICK += $TICK;
3370
3371 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3372 $NEXT_RUNTIME_WRITE = $NOW + 10;
3373 Coro::async_pool {
3374 write_runtime
3375 or warn "ERROR: unable to write runtime file: $!";
3376 };
3377 }
3378
3379# my $AFTER = Event::time;
3380# warn $AFTER - $NOW;#d#
3381
3382 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3383 $sig->send; 3981 $sig->send;
3384 } 3982 }
3385 while (my $sig = shift @WAIT_FOR_TICK) { 3983 while (my $sig = shift @WAIT_FOR_TICK) {
3386 $sig->send; 3984 $sig->send;
3387 } 3985 }
3388 3986
3389 $NOW = Event::time; 3987 $LOAD = ($NOW - $TICK_START) / $TICK;
3390
3391 # if we are delayed by four ticks or more, skip them all
3392 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3393
3394 $TICK_WATCHER->at ($NEXT_TICK);
3395 $TICK_WATCHER->start;
3396
3397 $LOAD = ($NOW - $tick_start) / $TICK;
3398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3988 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3399 3989
3400 _post_tick; 3990 if (0) {
3401 3991 if ($NEXT_TICK) {
3402 3992 my $jitter = $TICK_START - $NEXT_TICK;
3993 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3994 warn "jitter $JITTER\n";#d#
3995 }
3403 }, 3996 }
3404); 3997}
3405 3998
3406{ 3999{
3407 BDB::max_poll_time $TICK * 0.1; 4000 # configure BDB
3408 $BDB_POLL_WATCHER = Event->io ( 4001
3409 reentrant => 0,
3410 fd => BDB::poll_fileno,
3411 poll => 'r',
3412 prio => 0,
3413 data => WF_AUTOCANCEL,
3414 cb => \&BDB::poll_cb,
3415 );
3416 BDB::min_parallel 8; 4002 BDB::min_parallel 16;
3417 4003 BDB::max_poll_reqs $TICK * 0.1;
3418 BDB::set_sync_prepare { 4004 $AnyEvent::BDB::WATCHER->priority (1);
3419 my $status;
3420 my $current = $Coro::current;
3421 (
3422 sub {
3423 $status = $!;
3424 $current->ready; undef $current;
3425 },
3426 sub {
3427 Coro::schedule while defined $current;
3428 $! = $status;
3429 },
3430 )
3431 };
3432 4005
3433 unless ($DB_ENV) { 4006 unless ($DB_ENV) {
3434 $DB_ENV = BDB::db_env_create; 4007 $DB_ENV = BDB::db_env_create;
4008 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4009 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4010 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4011 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4012 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3435 4013
3436 cf::sync_job { 4014 cf::sync_job {
3437 eval { 4015 eval {
3438 BDB::db_env_open 4016 BDB::db_env_open
3439 $DB_ENV, 4017 $DB_ENV,
3441 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4019 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3442 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4020 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3443 0666; 4021 0666;
3444 4022
3445 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4023 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3446
3447 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3448 $DB_ENV->set_lk_detect;
3449 }; 4024 };
3450 4025
3451 cf::cleanup "db_env_open(db): $@" if $@; 4026 cf::cleanup "db_env_open(db): $@" if $@;
3452 }; 4027 };
3453 } 4028 }
4029
4030 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4031 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4032 };
4033 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4034 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4035 };
4036 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4037 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4038 };
3454} 4039}
3455 4040
3456{ 4041{
4042 # configure IO::AIO
4043
3457 IO::AIO::min_parallel 8; 4044 IO::AIO::min_parallel 8;
3458
3459 undef $Coro::AIO::WATCHER;
3460 IO::AIO::max_poll_time $TICK * 0.1; 4045 IO::AIO::max_poll_time $TICK * 0.1;
3461 $AIO_POLL_WATCHER = Event->io ( 4046 undef $AnyEvent::AIO::WATCHER;
3462 reentrant => 0,
3463 data => WF_AUTOCANCEL,
3464 fd => IO::AIO::poll_fileno,
3465 poll => 'r',
3466 prio => 6,
3467 cb => \&IO::AIO::poll_cb,
3468 );
3469} 4047}
3470 4048
3471my $_log_backtrace; 4049my $_log_backtrace;
3472 4050
3473sub _log_backtrace { 4051sub _log_backtrace {
3476 $msg =~ s/\n//; 4054 $msg =~ s/\n//;
3477 4055
3478 # limit the # of concurrent backtraces 4056 # limit the # of concurrent backtraces
3479 if ($_log_backtrace < 2) { 4057 if ($_log_backtrace < 2) {
3480 ++$_log_backtrace; 4058 ++$_log_backtrace;
4059 my $perl_bt = Carp::longmess $msg;
3481 async { 4060 async {
4061 $Coro::current->{desc} = "abt $msg";
4062
3482 my @bt = fork_call { 4063 my @bt = fork_call {
3483 @addr = map { sprintf "%x", $_ } @addr; 4064 @addr = map { sprintf "%x", $_ } @addr;
3484 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4065 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3485 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4066 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3486 or die "addr2line: $!"; 4067 or die "addr2line: $!";
3494 } 4075 }
3495 4076
3496 @funcs 4077 @funcs
3497 }; 4078 };
3498 4079
3499 LOG llevInfo, "[ABT] $msg\n"; 4080 LOG llevInfo, "[ABT] $perl_bt\n";
4081 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3500 LOG llevInfo, "[ABT] $_\n" for @bt; 4082 LOG llevInfo, "[ABT] $_\n" for @bt;
3501 --$_log_backtrace; 4083 --$_log_backtrace;
3502 }; 4084 };
3503 } else { 4085 } else {
3504 LOG llevInfo, "[ABT] $msg\n"; 4086 LOG llevInfo, "[ABT] $msg\n";
3505 LOG llevInfo, "[ABT] [suppressed]\n"; 4087 LOG llevInfo, "[ABT] [suppressed]\n";
3506 } 4088 }
3507} 4089}
3508 4090
3509# load additional modules 4091# load additional modules
3510use cf::pod; 4092require "cf/$_.pm" for @EXTRA_MODULES;
4093cf::_connect_to_perl_2;
3511 4094
3512END { cf::emergency_save } 4095END { cf::emergency_save }
3513 4096
35141 40971
3515 4098

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines