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.319 by root, Tue Jul 24 15:56:45 2007 UTC vs.
Revision 1.490 by root, Sat Oct 24 06:16:40 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 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 ();
14 37
38use Guard ();
15use Coro 3.61 (); 39use Coro ();
16use Coro::State; 40use Coro::State;
17use Coro::Handle; 41use Coro::Handle;
42use Coro::EV;
18use Coro::Event; 43use Coro::AnyEvent;
19use Coro::Timer; 44use Coro::Timer;
20use Coro::Signal; 45use Coro::Signal;
21use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
22use Coro::AIO; 49use Coro::AIO;
50use Coro::BDB 1.6;
23use Coro::Storable; 51use Coro::Storable;
52use Coro::Util ();
24 53
25use JSON::XS 1.4 (); 54use JSON::XS 2.01 ();
26use BDB (); 55use BDB ();
27use Data::Dumper; 56use Data::Dumper;
28use Digest::MD5; 57use Digest::MD5;
29use Fcntl; 58use Fcntl;
30use YAML::Syck (); 59use YAML::XS ();
31use IO::AIO 2.32 (); 60use IO::AIO ();
32use Time::HiRes; 61use Time::HiRes;
33use Compress::LZF; 62use Compress::LZF;
34use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
35 66
36# configure various modules to our taste 67# configure various modules to our taste
37# 68#
38$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 77
42$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
43 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
74 112
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 115our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
82 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
85 124
86our %CFG; 125our %CFG;
87 126
88our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 128our $RUNTIME;
129our $NOW;
90 130
91our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
94 134
95# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 137
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
101 147
102binmode STDOUT; 148binmode STDOUT;
103binmode STDERR; 149binmode STDERR;
104 150
105# read virtual server time, if available 151# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
110} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
111 159
112mkdir $_ 160mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 162
115our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
116 164
117sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
118 177
119############################################################################# 178#############################################################################
120 179
121=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
122 181
… …
158 217
159The raw value load value from the last tick. 218The raw value load value from the last tick.
160 219
161=item %cf::CFG 220=item %cf::CFG
162 221
163Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 223from wherever your confdir points to.
165 224
166=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
167 226
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 230
172=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
173 232
174This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call. 235that call.
177 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
178=back 243=back
179 244
180=cut 245=cut
181 246
182BEGIN { 247$Coro::State::WARNHOOK = sub {
183 *CORE::GLOBAL::warn = sub {
184 my $msg = join "", @_; 248 my $msg = join "", @_;
185 249
186 $msg .= "\n" 250 $msg .= "\n"
187 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
188 252
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 254
191 utf8::encode $msg;
192 LOG llevError, $msg; 255 LOG llevError, $msg;
193 }; 256};
194} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
195 271
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
206for my $pkg (qw( 282for my $pkg (qw(
207 cf::global cf::attachable 283 cf::global cf::attachable
208 cf::object cf::object::player 284 cf::object cf::object::player
209 cf::client cf::player 285 cf::client cf::player
210 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
211 cf::map cf::party cf::region 288 cf::party cf::region
212)) { 289)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 291}
216 292
217$Event::DIED = sub { 293$EV::DIED = sub {
218 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
219}; 295};
220 296
221############################################################################# 297#############################################################################
222 298
… …
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 322 $d
247 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
248} 324}
249 325
250=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
251 327
252Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
253 329
254=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
255 331
256Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
257 333
258=cut 334=cut
259 335
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 337
262sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
264 354
265=item cf::lock_wait $string 355=item cf::lock_wait $string
266 356
267Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
268 358
269=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
270 360
271Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
274returned. 364returned.
275 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
276Lock names should begin with a unique identifier (for example, cf::map::find 369Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
278 371
279=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
280 373
281Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
282 375
283=cut 376=cut
284 377
285our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
286 379
287sub lock_wait($) { 380sub lock_wait($) {
288 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 382}
296 383
297sub lock_acquire($) { 384sub lock_acquire($) {
298 my ($key) = @_; 385 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 386}
310 387
311sub lock_active($) { 388sub lock_active($) {
312 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 390}
316 391
317sub freeze_mainloop { 392sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
319 394
320 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start; 396}
322 }; 397
323 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
324 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
325} 411}
326 412
327=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
328 414
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
340our @SLOT_QUEUE; 426our @SLOT_QUEUE;
341our $SLOT_QUEUE; 427our $SLOT_QUEUE;
342 428
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
345 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
346 434
347 while () { 435 while () {
348 next_job: 436 next_job:
349 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
… …
357 } 445 }
358 } 446 }
359 } 447 }
360 448
361 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 452 $signal->wait;
365 } else { 453 } else {
366 Coro::schedule; 454 Coro::schedule;
367 } 455 }
368 } 456 }
369}; 457};
370 458
371sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
372 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
373 463
374 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
376 466
… …
390 480
391BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
392 482
393=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
394 484
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 488acceptable.
399 489
400If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
… …
406 496
407sub sync_job(&) { 497sub sync_job(&) {
408 my ($job) = @_; 498 my ($job) = @_;
409 499
410 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 501 my $time = EV::time;
412 502
413 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
415 505
416 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 507
418 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
419 509
420 my $busy = 1; 510 my $busy = 1;
421 my @res; 511 my @res;
422 512
423 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 515 @res = eval { $job->() };
425 warn $@ if $@; 516 warn $@ if $@;
426 undef $busy; 517 undef $busy;
427 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
428 519
429 while ($busy) { 520 while ($busy) {
430 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
431 } 525 }
526 }
432 527
433 $time = Event::time - $time; 528 my $time = EV::time - $time;
434 529
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
439 531
440 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
441 } else { 533 } else {
442 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
443 535
… …
468=item fork_call { }, $args 560=item fork_call { }, $args
469 561
470Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
474 566
475=cut 567=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 568
486sub fork_call(&@) { 569sub fork_call(&@) {
487 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
488 571
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 572 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 573 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 574 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 575
494 if (my $pid = fork) { 576 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 577 reset_signals;
508 local $SIG{__WARN__}; 578 &$cb
509 local $SIG{__DIE__}; 579 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 580
516 eval { 581 wantarray ? @res : $res[-1]
517 close $fh1; 582}
518 583
519 my @res = eval { $cb->(@args) }; 584=item $coin = coin_from_name $name
520 585
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 586=cut
522 close $fh2;
523 };
524 587
525 warn $@ if $@; 588our %coin_alias = (
526 _exit 0; 589 "silver" => "silvercoin",
527 } 590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
528} 609}
529 610
530=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
531 612
532Returns a single value from the environment database. 613Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
535 616
536Stores the given C<$value> in the family. It can currently store binary 617Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 618data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 619
620=item $db = cf::db_table "name"
621
622Create and/or open a new database table. The string must not be "db" and must be unique
623within each server.
624
539=cut 625=cut
626
627sub db_table($) {
628 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV;
630
631 eval {
632 $db->set_flags (BDB::CHKSUM);
633
634 utf8::encode $name;
635 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
636 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
637 cf::cleanup "db_open(db): $!" if $!;
638 };
639 cf::cleanup "db_open(db): $@" if $@;
640
641 $db
642}
540 643
541our $DB; 644our $DB;
542 645
543sub db_init { 646sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 647 cf::sync_job {
548 eval { 648 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 649 };
558} 650}
559 651
560sub db_get($$) { 652sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
562 654
… …
612 if (1) { 704 if (1) {
613 $md5 = 705 $md5 =
614 join "\x00", 706 join "\x00",
615 $processversion, 707 $processversion,
616 map { 708 map {
617 Coro::cede; 709 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 710 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 711 } 0.. $#$src;
620 712
621 713
622 my $dbmd5 = db_get cache => "$id/md5"; 714 my $dbmd5 = db_get cache => "$id/md5";
… …
660 752
661############################################################################# 753#############################################################################
662 754
663=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
664 756
665Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
666attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
668 760
669In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 763Deliantra).
672 764
673=over 4 765=over 4
674 766
675=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
676 768
… …
720=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
721 813
722Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
724 816
725Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
727 819
728These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
729 821
730=over 4 822=over 4
… …
958 } 1050 }
959 1051
960 0 1052 0
961} 1053}
962 1054
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1056
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1058
967Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
968 1060
… …
974 1066
975=cut 1067=cut
976 1068
977############################################################################# 1069#############################################################################
978# object support 1070# object support
979#
980 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
981sub _can_merge { 1105sub _can_merge {
982 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
983 1107
984 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1109
988 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
989} 1112}
990 1113
991sub reattach { 1114sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1116 my ($obj) = @_;
994 1117
1118 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1120
997 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
998 1122
999 @$registry = (); 1123 @$registry = ();
1000 1124
… …
1015cf::attachable->attach ( 1139cf::attachable->attach (
1016 prio => -1000000, 1140 prio => -1000000,
1017 on_instantiate => sub { 1141 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1019 1143
1020 $data = from_json $data; 1144 $data = decode_json $data;
1021 1145
1022 for (@$data) { 1146 for (@$data) {
1023 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1024 1148
1025 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
… …
1041sub object_freezer_save { 1165sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1043 1167
1044 sync_job { 1168 sync_job {
1045 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1048 1173
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1053 close $fh; 1181 aio_close $fh;
1054 1182
1055 if (@$objs) { 1183 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1061 close $fh; 1192 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1194 }
1064 } else { 1195 } else {
1065 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1066 } 1197 }
1067 1198
1068 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1069 } else { 1203 } else {
1070 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1071 } 1205 }
1072 } else { 1206 } else {
1073 aio_unlink $filename; 1207 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1075 } 1209 }
1076 } 1210 };
1077} 1211}
1078 1212
1079sub object_freezer_as_string { 1213sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1081 1215
… …
1093 or return; 1227 or return;
1094 1228
1095 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1231 or return;
1232
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1099 } 1235 }
1100 1236
1237 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1240
1103 return ($data, $av); 1241 ($data, $av)
1104} 1242}
1105 1243
1106=head2 COMMAND CALLBACKS 1244=head2 COMMAND CALLBACKS
1107 1245
1108=over 4 1246=over 4
… …
1162 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1163 1301
1164 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1165} 1303}
1166 1304
1305use File::Glob ();
1306
1167cf::player->attach ( 1307cf::player->attach (
1168 on_command => sub { 1308 on_command => sub {
1169 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1170 1310
1171 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1186 my ($type, $reply, @payload) = 1326 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1327 "ARRAY" eq ref $msg
1188 ? @$msg 1328 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1329 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1330
1331 my @reply;
1332
1191 if (my $cb = $EXTCMD{$type}) { 1333 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1334 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1335 }
1336
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1197 } else { 1340 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1342 }
1200 1343
1201 cf::override; 1344 cf::override;
1202 }, 1345 },
1203); 1346);
1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1204 1360
1205sub load_extensions { 1361sub load_extensions {
1206 cf::sync_job { 1362 cf::sync_job {
1207 my %todo; 1363 my %todo;
1208 1364
… …
1228 1384
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1387
1232 $ext{source} = 1388 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1235 . $source 1391 . $source
1236 . "\n};\n1"; 1392 . "\n};\n1";
1237 1393
1238 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1256 1412
1257 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1414 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1416 }
1262 1417
1263 warn $msg; 1418 warn $msg;
1264 } 1419 }
1265 1420
… …
1279 1434
1280=back 1435=back
1281 1436
1282=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1283 1438
1284Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1285 1440
1286=cut 1441=cut
1287 1442
1288package cf::player; 1443package cf::player;
1289 1444
1290use Coro::AIO; 1445use Coro::AIO;
1291 1446
1292=head3 cf::player 1447=head3 cf::player
1293 1448
1294=over 4 1449=over 4
1450
1451=item cf::player::num_playing
1452
1453Returns the official number of playing players, as per the Crossfire metaserver rules.
1454
1455=cut
1456
1457sub num_playing {
1458 scalar grep
1459 $_->ob->map
1460 && !$_->hidden
1461 && !$_->ob->flag (cf::FLAG_WIZ),
1462 cf::player::list
1463}
1295 1464
1296=item cf::player::find $login 1465=item cf::player::find $login
1297 1466
1298Returns the given player object, loading it if necessary (might block). 1467Returns the given player object, loading it if necessary (might block).
1299 1468
… …
1318 1487
1319sub exists($) { 1488sub exists($) {
1320 my ($login) = @_; 1489 my ($login) = @_;
1321 1490
1322 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1324} 1493}
1325 1494
1326sub find($) { 1495sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1497 my $login = $_[0];
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1504 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1505 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1506 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1508
1340 my $pl = load_pl path $login 1509 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1510 or return;
1511
1512 my $pl = cf::player::load_pl $f
1513 or return;
1514
1515 local $cf::PLAYER_LOADING{$login} = $pl;
1516 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1343 } 1518 }
1344 } 1519 }
1345} 1520}
1346 1521
… …
1355 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1356 1531
1357 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1359 1534
1535 cf::get_slot 0.01;
1536
1360 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1361 Coro::cede; 1538 cf::cede_to_tick;
1362} 1539}
1363 1540
1364sub new($) { 1541sub new($) {
1365 my ($login) = @_; 1542 my ($login) = @_;
1366 1543
… …
1372 $cf::PLAYER{$login} = $self; 1549 $cf::PLAYER{$login} = $self;
1373 1550
1374 $self 1551 $self
1375} 1552}
1376 1553
1554=item $player->send_msg ($channel, $msg, $color, [extra...])
1555
1556=cut
1557
1558sub send_msg {
1559 my $ns = shift->ns
1560 or return;
1561 $ns->send_msg (@_);
1562}
1563
1377=item $pl->quit_character 1564=item $pl->quit_character
1378 1565
1379Nukes the player without looking back. If logged in, the connection will 1566Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1567be destroyed. May block for a long time.
1381 1568
… …
1385 my ($pl) = @_; 1572 my ($pl) = @_;
1386 1573
1387 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1388 1575
1389 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1390 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1391 1578
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1396 1585
1397 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1434 or return []; 1623 or return [];
1435 1624
1436 my @logins; 1625 my @logins;
1437 1626
1438 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1628 my $path = path $login;
1629
1630 # a .pst is a dead give-away for a valid player
1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1636 }
1442 1637
1443 utf8::decode $login; 1638 utf8::decode $login;
1444 push @logins, $login; 1639 push @logins, $login;
1445 } 1640 }
1446 1641
… …
1473 } 1668 }
1474 1669
1475 \@paths 1670 \@paths
1476} 1671}
1477 1672
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479 1674
1480Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1676
1528=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1529 1678
1530Sends an ext reply to the player. 1679Sends an ext reply to the player.
1531 1680
1532=cut 1681=cut
1533 1682
1534sub ext_reply($$@) { 1683sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1684 my ($self, $id, @msg) = @_;
1536 1685
1537 if ($self->ns->extcmd == 2) { 1686 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1687}
1545 1688
1546=item $player->ext_msg ($type, @msg) 1689=item $player->ext_msg ($type, @msg)
1547 1690
1548Sends an ext event to the client. 1691Sends an ext event to the client.
… …
1604our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1606 1749
1607sub generate_random_map { 1750sub generate_random_map {
1608 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1609 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1756 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1735 1881
1736# the temporary/swap location 1882# the temporary/swap location
1737sub save_path { 1883sub save_path {
1738 my ($self) = @_; 1884 my ($self) = @_;
1739 1885
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1742} 1888}
1743 1889
1744# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1745sub uniq_path { 1891sub uniq_path {
1746 my ($self) = @_; 1892 my ($self) = @_;
1747 1893
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1750}
1751
1752# and all this just because we cannot iterate over
1753# all maps in C++...
1754sub change_all_map_light {
1755 my ($change) = @_;
1756
1757 $_->change_map_light ($change)
1758 for grep $_->outdoor, values %cf::MAP;
1759} 1896}
1760 1897
1761sub decay_objects { 1898sub decay_objects {
1762 my ($self) = @_; 1899 my ($self) = @_;
1763 1900
… …
1776 1913
1777sub load_header_from($) { 1914sub load_header_from($) {
1778 my ($self, $path) = @_; 1915 my ($self, $path) = @_;
1779 1916
1780 utf8::encode $path; 1917 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1918 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1919 or return;
1920
1921 $self->_load_header ($f)
1922 or return;
1923
1924 local $MAP_LOADING{$self->{path}} = $self;
1925 $f->resolve_delayed_derefs;
1786 1926
1787 $self->{load_path} = $path; 1927 $self->{load_path} = $path;
1788 1928
1789 1 1929 1
1790} 1930}
… …
1844sub find { 1984sub find {
1845 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1846 1986
1847 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1848 1988
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1850 1991
1851 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path";
1853 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1854 or return; 1994 or return;
1855 1995
1856 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1857 1997
… …
1859 or return; 1999 or return;
1860 2000
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2005 undef $guard1;
1864 $map->reset; 2006 $map->reset;
1865 undef $guard;
1866 return find $path; 2007 return find $path;
1867 } 2008 }
1868 2009
1869 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1870 } 2011 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
1880 2021
1881 my $path = $self->{path}; 2022 my $path = $self->{path};
1882 2023
1883 { 2024 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2025 my $guard = cf::lock_acquire "map_data:$path";
1885 2026
2027 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2028 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2029
1888 $self->in_memory (cf::MAP_LOADING); 2030 $self->in_memory (cf::MAP_LOADING);
1889 2031
1890 $self->alloc; 2032 $self->alloc;
1891 2033
1892 $self->pre_load; 2034 $self->pre_load;
1893 Coro::cede; 2035 cf::cede_to_tick;
1894 2036
2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2039 $self->_load_objects ($f)
1896 or return; 2040 or return;
1897 2041
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1899 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1900 2044
1901 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2046 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2047 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2049 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2050 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs;
2052 }
1906 } 2053 }
1907 } 2054 }
1908 2055
1909 Coro::cede; 2056 $f->resolve_delayed_derefs;
2057
2058 cf::cede_to_tick;
1910 # now do the right thing for maps 2059 # now do the right thing for maps
1911 $self->link_multipart_objects; 2060 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2061 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2062 unless $self->difficulty;
1914 Coro::cede; 2063 cf::cede_to_tick;
1915 2064
1916 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2066 $self->decay_objects;
1918 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1919 $self->update_buttons; 2068 $self->update_buttons;
1920 Coro::cede; 2069 cf::cede_to_tick;
1921 $self->set_darkness_map;
1922 Coro::cede;
1923 $self->activate; 2070 $self->activate;
1924 } 2071 }
1925 2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
2075
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2077 }
1928 2078
1929 $self->post_load; 2079 $self->post_load;
1930} 2080}
1931 2081
… …
1940 2090
1941 $self 2091 $self
1942} 2092}
1943 2093
1944# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1945sub load_diag { 2095sub load_neighbours {
1946 my ($map) = @_; 2096 my ($map) = @_;
1947 2097
1948 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1949 2099
1950 for (0 .. 3) { 2100 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1952 or next; 2102 or next;
1953 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1954 or next; 2104 or next;
1955 $neigh->load; 2105 $neigh->load;
1956 2106
2107 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2110 }
1960 2111
1961 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1963 or next; 2115 or next;
1964 $neigh->load; 2116 $neigh->load;
1965 } 2117 }
1966} 2118}
1967 2119
… …
1972} 2124}
1973 2125
1974sub do_load_sync { 2126sub do_load_sync {
1975 my ($map) = @_; 2127 my ($map) = @_;
1976 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1977 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1978} 2133}
1979 2134
1980our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1982 2137
1983sub find_async { 2138sub find_async {
1984 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1985 2140
1986 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1987 2142
1988 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2145 }
1991 2146
1992 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1993 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1994 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2154 if (my $map = find $k) {
1997 $map->load; 2155 $map->load if $v;
1998 } 2156 }
1999 2157
2000 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
2001 } 2159 }
2002 } 2160 }
2003 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
2004 }; 2162 };
2005 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
… …
2008} 2166}
2009 2167
2010sub save { 2168sub save {
2011 my ($self) = @_; 2169 my ($self) = @_;
2012 2170
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2172
2015 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2016 2174
2017 return unless $self->dirty; 2175 return unless $self->dirty;
2018 2176
… …
2024 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2025 2183
2026 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2027 2185
2028 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2030 }; 2189 };
2190
2191 cf::get_slot 0.02;
2031 2192
2032 if ($uniq) { 2193 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2196 } else {
… …
2041 my ($self) = @_; 2202 my ($self) = @_;
2042 2203
2043 # save first because save cedes 2204 # save first because save cedes
2044 $self->save; 2205 $self->save;
2045 2206
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2208
2048 return if $self->players; 2209 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2050 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2051 2212
2213 $self->in_memory (cf::MAP_SWAPPED);
2214
2215 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2217 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2218}
2055 2219
2056sub reset_at { 2220sub reset_at {
2057 my ($self) = @_; 2221 my ($self) = @_;
2058 2222
… …
2076 2240
2077 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2078 2242
2079 return if $self->players; 2243 return if $self->players;
2080 2244
2081 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2082 2246
2083 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2084 2248
2085 # need to save uniques path 2249 # need to save uniques path
2086 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2090 if $uniq; 2254 if $uniq;
2091 } 2255 }
2092 2256
2093 delete $cf::MAP{$self->path}; 2257 delete $cf::MAP{$self->path};
2094 2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2261 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2262
2099 $self->unlink_save; 2263 $self->unlink_save;
2100 $self->destroy; 2264 $self->destroy;
2101} 2265}
2102 2266
2103my $nuke_counter = "aaaa"; 2267my $nuke_counter = "aaaa";
2104 2268
2105sub nuke { 2269sub nuke {
2106 my ($self) = @_; 2270 my ($self) = @_;
2107 2271
2272 {
2273 my $lock = cf::lock_acquire "map_data:$self->{path}";
2274
2108 delete $cf::MAP{$self->path}; 2275 delete $cf::MAP{$self->path};
2109 2276
2110 $self->unlink_save; 2277 $self->unlink_save;
2111 2278
2112 bless $self, "cf::map"; 2279 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2280 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2281 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2282 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2284
2118 $cf::MAP{$self->path} = $self; 2285 $cf::MAP{$self->path} = $self;
2286 }
2119 2287
2120 $self->reset; # polite request, might not happen 2288 $self->reset; # polite request, might not happen
2121} 2289}
2122 2290
2123=item $maps = cf::map::tmp_maps 2291=item $maps = cf::map::tmp_maps
… …
2165 2333
2166sub unique_maps() { 2334sub unique_maps() {
2167 [ 2335 [
2168 map { 2336 map {
2169 utf8::decode $_; 2337 utf8::decode $_;
2170 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2171 ? normalise $_ 2341 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2343 ]
2175} 2344}
2176 2345
2177package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles>). May block.
2350
2351=cut
2352
2353sub static_maps() {
2354 my @dirs = "";
2355 my @maps;
2356
2357 while (@dirs) {
2358 my $dir = shift @dirs;
2359
2360 next if $dir eq "/styles";
2361
2362 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2363 or return;
2364
2365 for (@$files) {
2366 s/\.map$// or next;
2367 utf8::decode $_;
2368 push @maps, "$dir/$_";
2369 }
2370
2371 push @dirs, map "$dir/$_", @$dirs;
2372 }
2373
2374 \@maps
2375}
2178 2376
2179=back 2377=back
2180 2378
2181=head3 cf::object 2379=head3 cf::object
2182 2380
… …
2186 2384
2187=over 4 2385=over 4
2188 2386
2189=item $ob->inv_recursive 2387=item $ob->inv_recursive
2190 2388
2191Returns the inventory of the object _and_ their inventories, recursively. 2389Returns the inventory of the object I<and> their inventories, recursively,
2390but I<not> the object itself.
2192 2391
2193=cut 2392=cut
2194 2393
2195sub inv_recursive_; 2394sub inv_recursive_;
2196sub inv_recursive_ { 2395sub inv_recursive_ {
… …
2199 2398
2200sub inv_recursive { 2399sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2400 inv_recursive_ inv $_[0]
2202} 2401}
2203 2402
2403=item $ref = $ob->ref
2404
2405Creates and returns a persistent reference to an object that can be stored as a string.
2406
2407=item $ob = cf::object::deref ($refstring)
2408
2409returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2410even if the object actually exists. May block.
2411
2412=cut
2413
2414sub deref {
2415 my ($ref) = @_;
2416
2417 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2418 my ($uuid, $name) = ($1, $2);
2419 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2420 or return;
2421 $pl->ob->uuid eq $uuid
2422 or return;
2423
2424 $pl->ob
2425 } else {
2426 warn "$ref: cannot resolve object reference\n";
2427 undef
2428 }
2429}
2430
2204package cf; 2431package cf;
2205 2432
2206=back 2433=back
2207 2434
2208=head3 cf::object::player 2435=head3 cf::object::player
… …
2214Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2441Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2215can be C<undef>. Does the right thing when the player is currently in a 2442can be C<undef>. Does the right thing when the player is currently in a
2216dialogue with the given NPC character. 2443dialogue with the given NPC character.
2217 2444
2218=cut 2445=cut
2446
2447our $SAY_CHANNEL = {
2448 id => "say",
2449 title => "Map",
2450 reply => "say ",
2451 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2452};
2453
2454our $CHAT_CHANNEL = {
2455 id => "chat",
2456 title => "Chat",
2457 reply => "chat ",
2458 tooltip => "Player chat and shouts, global to the server.",
2459};
2219 2460
2220# rough implementation of a future "reply" method that works 2461# rough implementation of a future "reply" method that works
2221# with dialog boxes. 2462# with dialog boxes.
2222#TODO: the first argument must go, split into a $npc->reply_to ( method 2463#TODO: the first argument must go, split into a $npc->reply_to ( method
2223sub cf::object::player::reply($$$;$) { 2464sub cf::object::player::reply($$$;$) {
… …
2235 my $dialog = $pl->{npc_dialog}; 2476 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2477 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237 2478
2238 } else { 2479 } else {
2239 $msg = $npc->name . " says: $msg" if $npc; 2480 $msg = $npc->name . " says: $msg" if $npc;
2240 $self->message ($msg, $flags); 2481 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241 } 2482 }
2242 } 2483 }
2484}
2485
2486=item $object->send_msg ($channel, $msg, $color, [extra...])
2487
2488=cut
2489
2490sub cf::object::send_msg {
2491 my $pl = shift->contr
2492 or return;
2493 $pl->send_msg (@_);
2243} 2494}
2244 2495
2245=item $player_object->may ("access") 2496=item $player_object->may ("access")
2246 2497
2247Returns wether the given player is authorized to access resource "access" 2498Returns wether the given player is authorized to access resource "access"
… …
2260 2511
2261=item $player_object->enter_link 2512=item $player_object->enter_link
2262 2513
2263Freezes the player and moves him/her to a special map (C<{link}>). 2514Freezes the player and moves him/her to a special map (C<{link}>).
2264 2515
2265The player should be reasonably safe there for short amounts of time. You 2516The player should be reasonably safe there for short amounts of time (e.g.
2266I<MUST> call C<leave_link> as soon as possible, though. 2517for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2518though, as the palyer cannot control the character while it is on the link
2519map.
2267 2520
2268Will never block. 2521Will never block.
2269 2522
2270=item $player_object->leave_link ($map, $x, $y) 2523=item $player_object->leave_link ($map, $x, $y)
2271 2524
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2579 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2580 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2581 if $x <=0 && $y <= 0;
2329 2582
2330 $map->load; 2583 $map->load;
2331 $map->load_diag; 2584 $map->load_neighbours;
2332 2585
2333 return unless $self->contr->active; 2586 return unless $self->contr->active;
2334 $self->activate_recursive;
2335 2587
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2337 $self->enter_map ($map, $x, $y); 2589 $self->enter_map ($map, $x, $y);
2590
2591 # only activate afterwards, to support waiting in hooks
2592 $self->activate_recursive;
2338} 2593}
2339 2594
2340=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2595=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2341 2596
2342Moves the player to the given map-path and coordinates by first freezing 2597Moves the player to the given map-path and coordinates by first freezing
2343her, loading and preparing them map, calling the provided $check callback 2598her, loading and preparing them map, calling the provided $check callback
2344that has to return the map if sucecssful, and then unfreezes the player on 2599that has to return the map if sucecssful, and then unfreezes the player on
2345the new (success) or old (failed) map position. In either case, $done will 2600the new (success) or old (failed) map position. In either case, $done will
2346be called at the end of this process. 2601be called at the end of this process.
2347 2602
2603Note that $check will be called with a potentially non-loaded map, so if
2604it needs a loaded map it has to call C<< ->load >>.
2605
2348=cut 2606=cut
2349 2607
2350our $GOTOGEN; 2608our $GOTOGEN;
2351 2609
2352sub cf::object::player::goto { 2610sub cf::object::player::goto {
… …
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2614 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2615
2358 $self->enter_link; 2616 $self->enter_link;
2359 2617
2360 (async { 2618 (async {
2619 $Coro::current->{desc} = "player::goto $path $x $y";
2620
2621 # *tag paths override both path and x|y
2622 if ($path =~ /^\*(.*)$/) {
2623 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2624 my $ob = $obs[rand @obs];
2625
2626 # see if we actually can go there
2627 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2628 $ob = $obs[rand @obs];
2629 } else {
2630 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2631 }
2632 # else put us there anyways for now #d#
2633
2634 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2635 } else {
2636 ($path, $x, $y) = (undef, undef, undef);
2637 }
2638 }
2639
2361 my $map = eval { 2640 my $map = eval {
2362 my $map = cf::map::find $path; 2641 my $map = defined $path ? cf::map::find $path : undef;
2363 2642
2364 if ($map) { 2643 if ($map) {
2365 $map = $map->customise_for ($self); 2644 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2645 $map = $check->($map) if $check && $map;
2367 } else { 2646 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2647 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2648 }
2370 2649
2371 $map 2650 $map
2372 }; 2651 };
2373 2652
… …
2409} 2688}
2410 2689
2411sub prepare_random_map { 2690sub prepare_random_map {
2412 my ($exit) = @_; 2691 my ($exit) = @_;
2413 2692
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416 # all this does is basically replace the /! path by 2693 # all this does is basically replace the /! path by
2417 # a new random map path (?random/...) with a seed 2694 # a new random map path (?random/...) with a seed
2418 # that depends on the exit object 2695 # that depends on the exit object
2419 2696
2420 my $rmp = parse_random_map_params $exit->msg; 2697 my $rmp = parse_random_map_params $exit->msg;
… …
2422 if ($exit->map) { 2699 if ($exit->map) {
2423 $rmp->{region} = $exit->region->name; 2700 $rmp->{region} = $exit->region->name;
2424 $rmp->{origin_map} = $exit->map->path; 2701 $rmp->{origin_map} = $exit->map->path;
2425 $rmp->{origin_x} = $exit->x; 2702 $rmp->{origin_x} = $exit->x;
2426 $rmp->{origin_y} = $exit->y; 2703 $rmp->{origin_y} = $exit->y;
2704
2705 $exit->map->touch;
2427 } 2706 }
2428 2707
2429 $rmp->{random_seed} ||= $exit->random_seed; 2708 $rmp->{random_seed} ||= $exit->random_seed;
2430 2709
2431 my $data = cf::to_json $rmp; 2710 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2711 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2712 my $meta = "$RANDOMDIR/$md5.meta";
2434 2713
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2714 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2715 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh; 2716 undef $fh;
2438 aio_rename "$meta~", $meta; 2717 aio_rename "$meta~", $meta;
2439 2718
2719 my $slaying = "?random/$md5";
2720
2721 if ($exit->valid) {
2440 $exit->slaying ("?random/$md5"); 2722 $exit->slaying ("?random/$md5");
2441 $exit->msg (undef); 2723 $exit->msg (undef);
2724 }
2442 } 2725 }
2443} 2726}
2444 2727
2445sub cf::object::player::enter_exit { 2728sub cf::object::player::enter_exit {
2446 my ($self, $exit) = @_; 2729 my ($self, $exit) = @_;
2447 2730
2448 return unless $self->type == cf::PLAYER; 2731 return unless $self->type == cf::PLAYER;
2449 2732
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
2461 $self->enter_link; 2733 $self->enter_link;
2462 2734
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2467 (async { 2735 (async {
2468 $self->deactivate_recursive; # just to be sure 2736 $Coro::current->{desc} = "enter_exit";
2737
2469 unless (eval { 2738 unless (eval {
2739 $self->deactivate_recursive; # just to be sure
2740
2741 # random map handling
2742 {
2743 my $guard = cf::lock_acquire "exit_prepare:$exit";
2744
2745 prepare_random_map $exit
2746 if $exit->slaying eq "/!";
2747 }
2748
2749 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2750 my $x = $exit->stats->hp;
2751 my $y = $exit->stats->sp;
2752
2470 $self->goto ($slaying, $hp, $sp); 2753 $self->goto ($map, $x, $y);
2471 2754
2755 # if exit is damned, update players death & WoR home-position
2756 $self->contr->savebed ($map, $x, $y)
2757 if $exit->flag (cf::FLAG_DAMNED);
2758
2472 1; 2759 1
2473 }) { 2760 }) {
2474 $self->message ("Something went wrong deep within the crossfire server. " 2761 $self->message ("Something went wrong deep within the deliantra server. "
2475 . "I'll try to bring you back to the map you were before. " 2762 . "I'll try to bring you back to the map you were before. "
2476 . "Please report this to the dungeon master!", 2763 . "Please report this to the dungeon master!",
2477 cf::NDI_UNIQUE | cf::NDI_RED); 2764 cf::NDI_UNIQUE | cf::NDI_RED);
2478 2765
2479 warn "ERROR in enter_exit: $@"; 2766 warn "ERROR in enter_exit: $@";
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2794the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2795the message unless the client supports the msg packet.
2509 2796
2510=cut 2797=cut
2511 2798
2799# non-persistent channels (usually the info channel)
2800our %CHANNEL = (
2801 "c/motd" => {
2802 id => "infobox",
2803 title => "MOTD",
2804 reply => undef,
2805 tooltip => "The message of the day",
2806 },
2807 "c/identify" => {
2808 id => "infobox",
2809 title => "Identify",
2810 reply => undef,
2811 tooltip => "Items recently identified",
2812 },
2813 "c/examine" => {
2814 id => "infobox",
2815 title => "Examine",
2816 reply => undef,
2817 tooltip => "Signs and other items you examined",
2818 },
2819 "c/shopinfo" => {
2820 id => "infobox",
2821 title => "Shop Info",
2822 reply => undef,
2823 tooltip => "What your bargaining skill tells you about the shop",
2824 },
2825 "c/book" => {
2826 id => "infobox",
2827 title => "Book",
2828 reply => undef,
2829 tooltip => "The contents of a note or book",
2830 },
2831 "c/lookat" => {
2832 id => "infobox",
2833 title => "Look",
2834 reply => undef,
2835 tooltip => "What you saw there",
2836 },
2837 "c/who" => {
2838 id => "infobox",
2839 title => "Players",
2840 reply => undef,
2841 tooltip => "Shows players who are currently online",
2842 },
2843 "c/body" => {
2844 id => "infobox",
2845 title => "Body Parts",
2846 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available",
2848 },
2849 "c/statistics" => {
2850 id => "infobox",
2851 title => "Statistics",
2852 reply => undef,
2853 tooltip => "Shows your primary statistics",
2854 },
2855 "c/skills" => {
2856 id => "infobox",
2857 title => "Skills",
2858 reply => undef,
2859 tooltip => "Shows your experience per skill and item power",
2860 },
2861 "c/shopitems" => {
2862 id => "infobox",
2863 title => "Shop Items",
2864 reply => undef,
2865 tooltip => "Shows the items currently for sale in this shop",
2866 },
2867 "c/resistances" => {
2868 id => "infobox",
2869 title => "Resistances",
2870 reply => undef,
2871 tooltip => "Shows your resistances",
2872 },
2873 "c/pets" => {
2874 id => "infobox",
2875 title => "Pets",
2876 reply => undef,
2877 tooltip => "Shows information abotu your pets/a specific pet",
2878 },
2879 "c/perceiveself" => {
2880 id => "infobox",
2881 title => "Perceive Self",
2882 reply => undef,
2883 tooltip => "You gained detailed knowledge about yourself",
2884 },
2885 "c/uptime" => {
2886 id => "infobox",
2887 title => "Uptime",
2888 reply => undef,
2889 tooltip => "How long the server has been running since last restart",
2890 },
2891 "c/mapinfo" => {
2892 id => "infobox",
2893 title => "Map Info",
2894 reply => undef,
2895 tooltip => "Information related to the maps",
2896 },
2897 "c/party" => {
2898 id => "party",
2899 title => "Party",
2900 reply => "gsay ",
2901 tooltip => "Messages and chat related to your party",
2902 },
2903 "c/death" => {
2904 id => "death",
2905 title => "Death",
2906 reply => undef,
2907 tooltip => "Reason for and more info about your most recent death",
2908 },
2909 "c/say" => $SAY_CHANNEL,
2910 "c/chat" => $CHAT_CHANNEL,
2911);
2912
2512sub cf::client::send_msg { 2913sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2914 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2915
2515 $msg = $self->pl->expand_cfpod ($msg); 2916 $msg = $self->pl->expand_cfpod ($msg)
2917 unless $color & cf::NDI_VERBATIM;
2516 2918
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2919 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2920
2921 # check predefined channels, for the benefit of C
2922 if ($CHANNEL{$channel}) {
2923 $channel = $CHANNEL{$channel};
2924
2925 $self->ext_msg (channel_info => $channel);
2926 $channel = $channel->{id};
2927
2519 if (ref $channel) { 2928 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2929 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2930 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2931 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2932 $self->ext_msg (channel_info => $channel);
2524 } 2933 }
… …
2526 $channel = $channel->{id}; 2935 $channel = $channel->{id};
2527 } 2936 }
2528 2937
2529 return unless @extra || length $msg; 2938 return unless @extra || length $msg;
2530 2939
2531 if ($self->can_msg) { 2940 # default colour, mask it out
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2941 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2533 } else { 2942 if $color & cf::NDI_DEF;
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543 2943
2544 if ($color >= 0) { 2944 my $pkt = "msg "
2545 if (0 && $msg =~ /\[/) { 2945 . $self->{json_coder}->encode (
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2946 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2547 } else { 2947 );
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2948
2549 $self->send_packet ("drawinfo $color $msg") 2949 # try lzf for large packets
2550 } 2950 $pkt = "lzf " . Compress::LZF::compress $pkt
2551 } 2951 if 1024 <= length $pkt and $self->{can_lzf};
2952
2953 # split very large packets
2954 if (8192 < length $pkt and $self->{can_lzf}) {
2955 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2956 $pkt = "frag";
2552 } 2957 }
2958
2959 $self->send_packet ($pkt);
2553} 2960}
2554 2961
2555=item $client->ext_msg ($type, @msg) 2962=item $client->ext_msg ($type, @msg)
2556 2963
2557Sends an ext event to the client. 2964Sends an ext event to the client.
… …
2559=cut 2966=cut
2560 2967
2561sub cf::client::ext_msg($$@) { 2968sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2969 my ($self, $type, @msg) = @_;
2563 2970
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2971 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2972 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2973 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2974 push @msg, msgtype => "event_$type";
2975 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2976 }
2977}
2978
2979=item $client->ext_reply ($msgid, @msg)
2980
2981Sends an ext reply to the client.
2982
2983=cut
2984
2985sub cf::client::ext_reply($$@) {
2986 my ($self, $id, @msg) = @_;
2987
2988 if ($self->extcmd == 2) {
2989 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2990 } elsif ($self->extcmd == 1) {
2991 #TODO: version 1, remove
2992 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2993 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2994 }
2572} 2995}
2573 2996
2574=item $success = $client->query ($flags, "text", \&cb) 2997=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 3059 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 3060 "ARRAY" eq ref $msg
2638 ? @$msg 3061 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3062 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 3063
3064 my @reply;
3065
2641 if (my $cb = $EXTICMD{$type}) { 3066 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 3067 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 3068 }
3069
3070 $ns->ext_reply ($reply, @reply)
3071 if $reply;
3072
2647 } else { 3073 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3074 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 3075 }
2650 3076
2651 cf::override; 3077 cf::override;
… …
2698our $safe = new Safe "safe"; 3124our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3125our $safe_hole = new Safe::Hole;
2700 3126
2701$SIG{FPE} = 'IGNORE'; 3127$SIG{FPE} = 'IGNORE';
2702 3128
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3129$safe->permit_only (Opcode::opset qw(
3130 :base_core :base_mem :base_orig :base_math
3131 grepstart grepwhile mapstart mapwhile
3132 sort time
3133));
2704 3134
2705# here we export the classes and methods available to script code 3135# here we export the classes and methods available to script code
2706 3136
2707=pod 3137=pod
2708 3138
2709The following functions and methods are available within a safe environment: 3139The following functions and methods are available within a safe environment:
2710 3140
2711 cf::object 3141 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3142 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove 3143 insert remove name archname title slaying race decrease split
3144 value
2714 3145
2715 cf::object::player 3146 cf::object::player
2716 player 3147 player
2717 3148
2718 cf::player 3149 cf::player
… …
2723 3154
2724=cut 3155=cut
2725 3156
2726for ( 3157for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3158 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)], 3159 insert remove inv nrof name archname title slaying race
3160 decrease split destroy change_exp value msg lore send_msg)],
2729 ["cf::object::player" => qw(player)], 3161 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3162 ["cf::player" => qw(peaceful send_msg)],
2731 ["cf::map" => qw(trigger)], 3163 ["cf::map" => qw(trigger)],
2732) { 3164) {
2733 no strict 'refs'; 3165 no strict 'refs';
2734 my ($pkg, @funs) = @$_; 3166 my ($pkg, @funs) = @$_;
2735 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3167 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2752 my ($code, %vars) = @_; 3184 my ($code, %vars) = @_;
2753 3185
2754 my $qcode = $code; 3186 my $qcode = $code;
2755 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2756 $qcode =~ s/\n/\\n/g; 3188 $qcode =~ s/\n/\\n/g;
3189
3190 %vars = (_dummy => 0) unless %vars;
2757 3191
2758 local $_; 3192 local $_;
2759 local @safe::cf::_safe_eval_args = values %vars; 3193 local @safe::cf::_safe_eval_args = values %vars;
2760 3194
2761 my $eval = 3195 my $eval =
… …
2809# the server's init and main functions 3243# the server's init and main functions
2810 3244
2811sub load_facedata($) { 3245sub load_facedata($) {
2812 my ($path) = @_; 3246 my ($path) = @_;
2813 3247
3248 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = ();
3251
3252 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3253
2814 warn "loading facedata from $path\n"; 3254 warn "loading facedata from $path\n";
2815 3255
2816 my $facedata; 3256 my $facedata;
2817 0 < aio_load $path, $facedata 3257 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3258 or die "$path: $!";
… …
2820 $facedata = Coro::Storable::thaw $facedata; 3260 $facedata = Coro::Storable::thaw $facedata;
2821 3261
2822 $facedata->{version} == 2 3262 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3263 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3264
3265 # patch in the exptable
3266 $facedata->{resource}{"res/exp_table"} = {
3267 type => FT_RSRC,
3268 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3269 };
3270 cf::cede_to_tick;
3271
2825 { 3272 {
2826 my $faces = $facedata->{faceinfo}; 3273 my $faces = $facedata->{faceinfo};
2827 3274
2828 while (my ($face, $info) = each %$faces) { 3275 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3276 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3277
2830 cf::face::set_visibility $idx, $info->{visibility}; 3278 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3279 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3280 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3281 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3282
2835 cf::cede_to_tick; 3283 cf::cede_to_tick;
2836 } 3284 }
2837 3285
2838 while (my ($face, $info) = each %$faces) { 3286 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3287 next unless $info->{smooth};
3288
2840 my $idx = cf::face::find $face 3289 my $idx = cf::face::find $face
2841 or next; 3290 or next;
3291
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3292 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3293 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3294 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3295 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3296 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2863 3313
2864 { 3314 {
2865 # TODO: for gcfclient pleasure, we should give resources 3315 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3316 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3317 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3318
2870 while (my ($name, $info) = each %$res) { 3319 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({ 3320 if (defined $info->{type}) {
2872 name => $name,
2873 copyright => $info->{copyright}, #TODO#
2874 });
2875
2876 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3321 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3322 my $data;
2877 3323
2878 if ($info->{type} & 1) { 3324 if ($info->{type} & 1) {
2879 # prepend meta info 3325 # prepend meta info
2880 3326
3327 my $meta = $enc->encode ({
3328 name => $name,
3329 %{ $info->{meta} || {} },
3330 });
3331
2881 my $data = pack "(w/a*)*", $meta, $info->{data}; 3332 $data = pack "(w/a*)*", $meta, $info->{data};
2882 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3333 } else {
3334 $data = $info->{data};
3335 }
2883 3336
2884 cf::face::set_data $idx, 0, $data, $chk; 3337 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3338 cf::face::set_type $idx, $info->{type};
2885 } else { 3339 } else {
2886 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3340 $RESOURCE{$name} = $info;
2887 } 3341 }
2888 3342
2889 cf::face::set_type $idx, $info->{type};
2890
2891 cf::cede_to_tick; 3343 cf::cede_to_tick;
2892 } 3344 }
2893 } 3345 }
2894 3346
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348
2895 1 3349 1
2896} 3350}
3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
2897 3371
2898register_exticmd fx_want => sub { 3372register_exticmd fx_want => sub {
2899 my ($ns, $want) = @_; 3373 my ($ns, $want) = @_;
2900 3374
2901 while (my ($k, $v) = each %$want) { 3375 while (my ($k, $v) = each %$want) {
2902 $ns->fx_want ($k, $v); 3376 $ns->fx_want ($k, $v);
2903 } 3377 }
2904}; 3378};
2905 3379
3380sub load_resource_file($) {
3381 my $guard = lock_acquire "load_resource_file";
3382
3383 my $status = load_resource_file_ $_[0];
3384 get_slot 0.1, 100;
3385 cf::arch::commit_load;
3386
3387 $status
3388}
3389
2906sub reload_regions { 3390sub reload_regions {
3391 # HACK to clear player env face cache, we need some signal framework
3392 # for this (global event?)
3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3394
2907 load_resource_file "$MAPDIR/regions" 3395 load_resource_file "$MAPDIR/regions"
2908 or die "unable to load regions file\n"; 3396 or die "unable to load regions file\n";
2909 3397
2910 for (cf::region::list) { 3398 for (cf::region::list) {
2911 $_->{match} = qr/$_->{match}/ 3399 $_->{match} = qr/$_->{match}/
… …
2919} 3407}
2920 3408
2921sub reload_archetypes { 3409sub reload_archetypes {
2922 load_resource_file "$DATADIR/archetypes" 3410 load_resource_file "$DATADIR/archetypes"
2923 or die "unable to load archetypes\n"; 3411 or die "unable to load archetypes\n";
2924 #d# NEED to laod twice to resolve forward references
2925 # this really needs to be done in an extra post-pass
2926 # (which needs to be synchronous, so solve it differently)
2927 load_resource_file "$DATADIR/archetypes"
2928 or die "unable to load archetypes\n";
2929} 3412}
2930 3413
2931sub reload_treasures { 3414sub reload_treasures {
2932 load_resource_file "$DATADIR/treasures" 3415 load_resource_file "$DATADIR/treasures"
2933 or die "unable to load treasurelists\n"; 3416 or die "unable to load treasurelists\n";
2934} 3417}
2935 3418
2936sub reload_resources { 3419sub reload_resources {
2937 warn "reloading resource files...\n"; 3420 warn "reloading resource files...\n";
2938 3421
3422 reload_facedata;
3423 reload_archetypes;
2939 reload_regions; 3424 reload_regions;
2940 reload_facedata;
2941 #reload_archetypes;#d#
2942 reload_archetypes;
2943 reload_treasures; 3425 reload_treasures;
2944 3426
2945 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
2946} 3428}
2947 3429
2948sub init { 3430sub reload_config {
2949 reload_resources; 3431 warn "reloading config file...\n";
2950}
2951 3432
2952sub cfg_load {
2953 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
2954 or return; 3434 or return;
2955 3435
2956 local $/; 3436 local $/;
2957 *CFG = YAML::Syck::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
2958 3438
2959 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2960 3440
2961 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2962 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2966 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2967 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
2968 }; 3448 };
2969 warn $@ if $@; 3449 warn $@ if $@;
2970 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
2971} 3481}
2972 3482
2973sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
2974 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
2975 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
2976 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2977 (async { 3501 (async {
2978 Event::one_event; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3503 EV::loop EV::LOOP_ONESHOT;
2979 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
2980 }; 3505 };
2981 3506
2982 cfg_load; 3507 evthread_start IO::AIO::poll_fileno;
3508
3509 cf::sync_job {
3510 reload_resources;
3511 reload_config;
2983 db_init; 3512 db_init;
3513
3514 cf::load_settings;
3515 cf::load_materials;
3516 cf::init_uuid;
3517 cf::init_signals;
3518 cf::init_commands;
3519 cf::init_skills;
3520
3521 cf::init_beforeplay;
3522
3523 atomic;
3524
2984 load_extensions; 3525 load_extensions;
2985 3526
2986 $TICK_WATCHER->start; 3527 utime time, time, $RUNTIMEFILE;
2987 Event::loop; 3528
3529 # no (long-running) fork's whatsoever before this point(!)
3530 use POSIX ();
3531 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3532
3533 (pop @POST_INIT)->(0) while @POST_INIT;
3534 };
3535
3536 main_loop;
2988} 3537}
2989 3538
2990############################################################################# 3539#############################################################################
2991# initialisation and cleanup 3540# initialisation and cleanup
2992 3541
2993# install some emergency cleanup handlers 3542# install some emergency cleanup handlers
2994BEGIN { 3543BEGIN {
3544 our %SIGWATCHER = ();
2995 for my $signal (qw(INT HUP TERM)) { 3545 for my $signal (qw(INT HUP TERM)) {
2996 Event->signal ( 3546 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2997 reentrant => 0,
2998 data => WF_AUTOCANCEL,
2999 signal => $signal,
3000 prio => 0,
3001 cb => sub {
3002 cf::cleanup "SIG$signal"; 3547 cf::cleanup "SIG$signal";
3003 },
3004 ); 3548 };
3005 } 3549 }
3006} 3550}
3007 3551
3008sub write_runtime { 3552sub write_runtime_sync {
3009 my $runtime = "$LOCALDIR/runtime";
3010
3011 # first touch the runtime file to show we are still running: 3553 # first touch the runtime file to show we are still running:
3012 # the fsync below can take a very very long time. 3554 # the fsync below can take a very very long time.
3013 3555
3014 IO::AIO::aio_utime $runtime, undef, undef; 3556 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3015 3557
3016 my $guard = cf::lock_acquire "write_runtime"; 3558 my $guard = cf::lock_acquire "write_runtime";
3017 3559
3018 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3560 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3019 or return; 3561 or return;
3020 3562
3021 my $value = $cf::RUNTIME + 90 + 10; 3563 my $value = $cf::RUNTIME + 90 + 10;
3022 # 10 is the runtime save interval, for a monotonic clock 3564 # 10 is the runtime save interval, for a monotonic clock
3023 # 60 allows for the watchdog to kill the server. 3565 # 60 allows for the watchdog to kill the server.
… …
3033 aio_utime $fh, undef, undef; 3575 aio_utime $fh, undef, undef;
3034 3576
3035 close $fh 3577 close $fh
3036 or return; 3578 or return;
3037 3579
3038 aio_rename "$runtime~", $runtime 3580 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3039 and return; 3581 and return;
3040 3582
3041 warn "runtime file written.\n"; 3583 warn "runtime file written.\n";
3042 3584
3043 1 3585 1
3586}
3587
3588our $uuid_lock;
3589our $uuid_skip;
3590
3591sub write_uuid_sync($) {
3592 $uuid_skip ||= $_[0];
3593
3594 return if $uuid_lock;
3595 local $uuid_lock = 1;
3596
3597 my $uuid = "$LOCALDIR/uuid";
3598
3599 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3600 or return;
3601
3602 my $value = uuid_seq uuid_cur;
3603
3604 unless ($value) {
3605 warn "cowardly refusing to write zero uuid value!\n";
3606 return;
3607 }
3608
3609 my $value = uuid_str $value + $uuid_skip;
3610 $uuid_skip = 0;
3611
3612 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3613 and return;
3614
3615 # always fsync - this file is important
3616 aio_fsync $fh
3617 and return;
3618
3619 close $fh
3620 or return;
3621
3622 aio_rename "$uuid~", $uuid
3623 and return;
3624
3625 warn "uuid file written ($value).\n";
3626
3627 1
3628
3629}
3630
3631sub write_uuid($$) {
3632 my ($skip, $sync) = @_;
3633
3634 $sync ? write_uuid_sync $skip
3635 : async { write_uuid_sync $skip };
3044} 3636}
3045 3637
3046sub emergency_save() { 3638sub emergency_save() {
3047 my $freeze_guard = cf::freeze_mainloop; 3639 my $freeze_guard = cf::freeze_mainloop;
3048 3640
3049 warn "enter emergency perl save\n"; 3641 warn "emergency_perl_save: enter\n";
3050 3642
3051 cf::sync_job { 3643 cf::sync_job {
3644 # this is a trade-off: we want to be very quick here, so
3645 # save all maps without fsync, and later call a global sync
3646 # (which in turn might be very very slow)
3647 local $USE_FSYNC = 0;
3648
3052 # use a peculiar iteration method to avoid tripping on perl 3649 # use a peculiar iteration method to avoid tripping on perl
3053 # refcount bugs in for. also avoids problems with players 3650 # refcount bugs in for. also avoids problems with players
3054 # and maps saved/destroyed asynchronously. 3651 # and maps saved/destroyed asynchronously.
3055 warn "begin emergency player save\n"; 3652 warn "emergency_perl_save: begin player save\n";
3056 for my $login (keys %cf::PLAYER) { 3653 for my $login (keys %cf::PLAYER) {
3057 my $pl = $cf::PLAYER{$login} or next; 3654 my $pl = $cf::PLAYER{$login} or next;
3058 $pl->valid or next; 3655 $pl->valid or next;
3656 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3059 $pl->save; 3657 $pl->save;
3060 } 3658 }
3061 warn "end emergency player save\n"; 3659 warn "emergency_perl_save: end player save\n";
3062 3660
3063 warn "begin emergency map save\n"; 3661 warn "emergency_perl_save: begin map save\n";
3064 for my $path (keys %cf::MAP) { 3662 for my $path (keys %cf::MAP) {
3065 my $map = $cf::MAP{$path} or next; 3663 my $map = $cf::MAP{$path} or next;
3066 $map->valid or next; 3664 $map->valid or next;
3067 $map->save; 3665 $map->save;
3068 } 3666 }
3069 warn "end emergency map save\n"; 3667 warn "emergency_perl_save: end map save\n";
3070 3668
3071 warn "begin emergency database checkpoint\n"; 3669 warn "emergency_perl_save: begin database checkpoint\n";
3072 BDB::db_env_txn_checkpoint $DB_ENV; 3670 BDB::db_env_txn_checkpoint $DB_ENV;
3073 warn "end emergency database checkpoint\n"; 3671 warn "emergency_perl_save: end database checkpoint\n";
3672
3673 warn "emergency_perl_save: begin write uuid\n";
3674 write_uuid_sync 1;
3675 warn "emergency_perl_save: end write uuid\n";
3074 }; 3676 };
3075 3677
3678 warn "emergency_perl_save: starting sync()\n";
3679 IO::AIO::aio_sync sub {
3680 warn "emergency_perl_save: finished sync()\n";
3681 };
3682
3076 warn "leave emergency perl save\n"; 3683 warn "emergency_perl_save: leave\n";
3077} 3684}
3078 3685
3079sub post_cleanup { 3686sub post_cleanup {
3080 my ($make_core) = @_; 3687 my ($make_core) = @_;
3081 3688
3082 warn Carp::longmess "post_cleanup backtrace" 3689 warn Carp::longmess "post_cleanup backtrace"
3083 if $make_core; 3690 if $make_core;
3691
3692 my $fh = pidfile;
3693 unlink $PIDFILE if <$fh> == $$;
3694}
3695
3696# a safer delete_package, copied from Symbol
3697sub clear_package($) {
3698 my $pkg = shift;
3699
3700 # expand to full symbol table name if needed
3701 unless ($pkg =~ /^main::.*::$/) {
3702 $pkg = "main$pkg" if $pkg =~ /^::/;
3703 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3704 $pkg .= '::' unless $pkg =~ /::$/;
3705 }
3706
3707 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3708 my $stem_symtab = *{$stem}{HASH};
3709
3710 defined $stem_symtab and exists $stem_symtab->{$leaf}
3711 or return;
3712
3713 # clear all symbols
3714 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3715 for my $name (keys %$leaf_symtab) {
3716 _gv_clear *{"$pkg$name"};
3717# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3718 }
3719 warn "cleared package $pkg\n";#d#
3084} 3720}
3085 3721
3086sub do_reload_perl() { 3722sub do_reload_perl() {
3087 # can/must only be called in main 3723 # can/must only be called in main
3088 if ($Coro::current != $Coro::main) { 3724 if ($Coro::current != $Coro::main) {
3089 warn "can only reload from main coroutine"; 3725 warn "can only reload from main coroutine";
3090 return; 3726 return;
3091 } 3727 }
3092 3728
3729 return if $RELOAD++;
3730
3731 my $t1 = EV::time;
3732
3733 while ($RELOAD) {
3093 warn "reloading..."; 3734 warn "reloading...";
3094 3735
3095 warn "entering sync_job"; 3736 warn "entering sync_job";
3096 3737
3097 cf::sync_job { 3738 cf::sync_job {
3098 cf::write_runtime; # external watchdog should not bark 3739 cf::write_runtime_sync; # external watchdog should not bark
3099 cf::emergency_save; 3740 cf::emergency_save;
3100 cf::write_runtime; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
3101 3742
3102 warn "syncing database to disk"; 3743 warn "syncing database to disk";
3103 BDB::db_env_txn_checkpoint $DB_ENV; 3744 BDB::db_env_txn_checkpoint $DB_ENV;
3104 3745
3105 # if anything goes wrong in here, we should simply crash as we already saved 3746 # if anything goes wrong in here, we should simply crash as we already saved
3106 3747
3107 warn "cancelling all WF_AUTOCANCEL watchers";
3108 for (Event::all_watchers) {
3109 $_->cancel if $_->data & WF_AUTOCANCEL;
3110 }
3111
3112 warn "flushing outstanding aio requests"; 3748 warn "flushing outstanding aio requests";
3113 for (;;) {
3114 BDB::flush;
3115 IO::AIO::flush;
3116 Coro::cede;
3117 last unless IO::AIO::nreqs || BDB::nreqs; 3749 while (IO::AIO::nreqs || BDB::nreqs) {
3118 warn "iterate..."; 3750 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3119 }
3120
3121 ++$RELOAD;
3122
3123 warn "cancelling all extension coros";
3124 $_->cancel for values %EXT_CORO;
3125 %EXT_CORO = ();
3126
3127 warn "removing commands";
3128 %COMMAND = ();
3129
3130 warn "removing ext/exti commands";
3131 %EXTCMD = ();
3132 %EXTICMD = ();
3133
3134 warn "unloading/nuking all extensions";
3135 for my $pkg (@EXTS) {
3136 warn "... unloading $pkg";
3137
3138 if (my $cb = $pkg->can ("unload")) {
3139 eval {
3140 $cb->($pkg);
3141 1
3142 } or warn "$pkg unloaded, but with errors: $@";
3143 } 3751 }
3144 3752
3145 warn "... nuking $pkg"; 3753 warn "cancelling all extension coros";
3146 Symbol::delete_package $pkg; 3754 $_->cancel for values %EXT_CORO;
3147 } 3755 %EXT_CORO = ();
3148 3756
3149 warn "unloading all perl modules loaded from $LIBDIR"; 3757 warn "removing commands";
3150 while (my ($k, $v) = each %INC) { 3758 %COMMAND = ();
3151 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3152 3759
3760 warn "removing ext/exti commands";
3761 %EXTCMD = ();
3762 %EXTICMD = ();
3763
3764 warn "unloading/nuking all extensions";
3765 for my $pkg (@EXTS) {
3153 warn "... unloading $k"; 3766 warn "... unloading $pkg";
3154 delete $INC{$k};
3155 3767
3156 $k =~ s/\.pm$//;
3157 $k =~ s/\//::/g;
3158
3159 if (my $cb = $k->can ("unload_module")) { 3768 if (my $cb = $pkg->can ("unload")) {
3769 eval {
3160 $cb->(); 3770 $cb->($pkg);
3771 1
3772 } or warn "$pkg unloaded, but with errors: $@";
3773 }
3774
3775 warn "... clearing $pkg";
3776 clear_package $pkg;
3161 } 3777 }
3162 3778
3163 Symbol::delete_package $k; 3779 warn "unloading all perl modules loaded from $LIBDIR";
3780 while (my ($k, $v) = each %INC) {
3781 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3782
3783 warn "... unloading $k";
3784 delete $INC{$k};
3785
3786 $k =~ s/\.pm$//;
3787 $k =~ s/\//::/g;
3788
3789 if (my $cb = $k->can ("unload_module")) {
3790 $cb->();
3791 }
3792
3793 clear_package $k;
3164 } 3794 }
3165 3795
3166 warn "getting rid of safe::, as good as possible"; 3796 warn "getting rid of safe::, as good as possible";
3167 Symbol::delete_package "safe::$_" 3797 clear_package "safe::$_"
3168 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3798 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3169 3799
3170 warn "unloading cf.pm \"a bit\""; 3800 warn "unloading cf.pm \"a bit\"";
3171 delete $INC{"cf.pm"}; 3801 delete $INC{"cf.pm"};
3172 delete $INC{"cf/pod.pm"}; 3802 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3173 3803
3174 # don't, removes xs symbols, too, 3804 # don't, removes xs symbols, too,
3175 # and global variables created in xs 3805 # and global variables created in xs
3176 #Symbol::delete_package __PACKAGE__; 3806 #clear_package __PACKAGE__;
3177 3807
3178 warn "unload completed, starting to reload now"; 3808 warn "unload completed, starting to reload now";
3179 3809
3180 warn "reloading cf.pm"; 3810 warn "reloading cf.pm";
3181 require cf; 3811 require cf;
3182 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3812 cf::_connect_to_perl_1;
3183 3813
3184 warn "loading config and database again"; 3814 warn "loading config and database again";
3185 cf::cfg_load; 3815 cf::reload_config;
3186 3816
3187 warn "loading extensions"; 3817 warn "loading extensions";
3188 cf::load_extensions; 3818 cf::load_extensions;
3189 3819
3820 if ($REATTACH_ON_RELOAD) {
3190 warn "reattaching attachments to objects/players"; 3821 warn "reattaching attachments to objects/players";
3191 _global_reattach; # objects, sockets 3822 _global_reattach; # objects, sockets
3192 warn "reattaching attachments to maps"; 3823 warn "reattaching attachments to maps";
3193 reattach $_ for values %MAP; 3824 reattach $_ for values %MAP;
3194 warn "reattaching attachments to players"; 3825 warn "reattaching attachments to players";
3195 reattach $_ for values %PLAYER; 3826 reattach $_ for values %PLAYER;
3827 }
3196 3828
3829 warn "running post_init jobs";
3830 (pop @POST_INIT)->(1) while @POST_INIT;
3831
3197 warn "leaving sync_job"; 3832 warn "leaving sync_job";
3198 3833
3199 1 3834 1
3200 } or do { 3835 } or do {
3201 warn $@; 3836 warn $@;
3202 warn "error while reloading, exiting."; 3837 cf::cleanup "error while reloading, exiting.";
3203 exit 1;
3204 }; 3838 };
3205 3839
3206 warn "reloaded"; 3840 warn "reloaded";
3841 --$RELOAD;
3842 }
3843
3844 $t1 = EV::time - $t1;
3845 warn "reload completed in ${t1}s\n";
3207}; 3846};
3208 3847
3209our $RELOAD_WATCHER; # used only during reload 3848our $RELOAD_WATCHER; # used only during reload
3210 3849
3211sub reload_perl() { 3850sub reload_perl() {
3212 # doing reload synchronously and two reloads happen back-to-back, 3851 # doing reload synchronously and two reloads happen back-to-back,
3213 # coro crashes during coro_state_free->destroy here. 3852 # coro crashes during coro_state_free->destroy here.
3214 3853
3215 $RELOAD_WATCHER ||= Event->timer ( 3854 $RELOAD_WATCHER ||= cf::async {
3216 reentrant => 0, 3855 Coro::AIO::aio_wait cache_extensions;
3217 after => 0, 3856
3218 data => WF_AUTOCANCEL, 3857 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3219 cb => sub {
3220 do_reload_perl; 3858 do_reload_perl;
3221 undef $RELOAD_WATCHER; 3859 undef $RELOAD_WATCHER;
3222 }, 3860 };
3223 ); 3861 };
3224} 3862}
3225 3863
3226register_command "reload" => sub { 3864register_command "reload" => sub {
3227 my ($who, $arg) = @_; 3865 my ($who, $arg) = @_;
3228 3866
3229 if ($who->flag (FLAG_WIZ)) { 3867 if ($who->flag (FLAG_WIZ)) {
3230 $who->message ("reloading server."); 3868 $who->message ("reloading server.");
3869 async {
3870 $Coro::current->{desc} = "perl_reload";
3231 async { reload_perl }; 3871 reload_perl;
3872 };
3232 } 3873 }
3233}; 3874};
3234 3875
3235unshift @INC, $LIBDIR; 3876unshift @INC, $LIBDIR;
3236 3877
… …
3238 3879
3239our @WAIT_FOR_TICK; 3880our @WAIT_FOR_TICK;
3240our @WAIT_FOR_TICK_BEGIN; 3881our @WAIT_FOR_TICK_BEGIN;
3241 3882
3242sub wait_for_tick { 3883sub wait_for_tick {
3243 return unless $TICK_WATCHER->is_active;
3244 return if $Coro::current == $Coro::main; 3884 return if tick_inhibit || $Coro::current == $Coro::main;
3245 3885
3246 my $signal = new Coro::Signal; 3886 my $signal = new Coro::Signal;
3247 push @WAIT_FOR_TICK, $signal; 3887 push @WAIT_FOR_TICK, $signal;
3248 $signal->wait; 3888 $signal->wait;
3249} 3889}
3250 3890
3251sub wait_for_tick_begin { 3891sub wait_for_tick_begin {
3252 return unless $TICK_WATCHER->is_active;
3253 return if $Coro::current == $Coro::main; 3892 return if tick_inhibit || $Coro::current == $Coro::main;
3254 3893
3255 my $signal = new Coro::Signal; 3894 my $signal = new Coro::Signal;
3256 push @WAIT_FOR_TICK_BEGIN, $signal; 3895 push @WAIT_FOR_TICK_BEGIN, $signal;
3257 $signal->wait; 3896 $signal->wait;
3258} 3897}
3259 3898
3260 my $min = 1e6;#d# 3899sub tick {
3261 my $avg = 10;
3262$TICK_WATCHER = Event->timer (
3263 reentrant => 0,
3264 parked => 1,
3265 prio => 0,
3266 at => $NEXT_TICK || $TICK,
3267 data => WF_AUTOCANCEL,
3268 cb => sub {
3269 if ($Coro::current != $Coro::main) { 3900 if ($Coro::current != $Coro::main) {
3270 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3901 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3271 unless ++$bug_warning > 10; 3902 unless ++$bug_warning > 10;
3272 return; 3903 return;
3273 } 3904 }
3274 3905
3275 $NOW = $tick_start = Event::time;
3276
3277 cf::server_tick; # one server iteration 3906 cf::server_tick; # one server iteration
3278 3907
3279 0 && sync_job {#d# 3908 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3280 for(1..10) { 3909 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3281 my $t = Event::time; 3910 Coro::async_pool {
3282 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3911 $Coro::current->{desc} = "runtime saver";
3283 or die; 3912 write_runtime_sync
3284 3913 or warn "ERROR: unable to write runtime file: $!";
3285 $map->width (50);
3286 $map->height (50);
3287 $map->alloc;
3288 $map->_load_objects ("/tmp/x.map", 1);
3289 my $t = Event::time - $t;
3290
3291 #next unless $t < 0.0013;#d#
3292 if ($t < $min) {
3293 $min = $t;
3294 }
3295 $avg = $avg * 0.99 + $t * 0.01;
3296 }
3297 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3298 exit 0;
3299 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3300 }; 3914 };
3915 }
3301 3916
3302 $RUNTIME += $TICK;
3303 $NEXT_TICK += $TICK;
3304
3305 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3306 $NEXT_RUNTIME_WRITE = $NOW + 10;
3307 Coro::async_pool {
3308 write_runtime
3309 or warn "ERROR: unable to write runtime file: $!";
3310 };
3311 }
3312
3313# my $AFTER = Event::time;
3314# warn $AFTER - $NOW;#d#
3315
3316 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3917 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3317 $sig->send; 3918 $sig->send;
3318 } 3919 }
3319 while (my $sig = shift @WAIT_FOR_TICK) { 3920 while (my $sig = shift @WAIT_FOR_TICK) {
3320 $sig->send; 3921 $sig->send;
3321 } 3922 }
3322 3923
3323 $NOW = Event::time; 3924 $LOAD = ($NOW - $TICK_START) / $TICK;
3324
3325 # if we are delayed by four ticks or more, skip them all
3326 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3327
3328 $TICK_WATCHER->at ($NEXT_TICK);
3329 $TICK_WATCHER->start;
3330
3331 $LOAD = ($NOW - $tick_start) / $TICK;
3332 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3925 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3333 3926
3334 _post_tick; 3927 if (0) {
3335 3928 if ($NEXT_TICK) {
3336 3929 my $jitter = $TICK_START - $NEXT_TICK;
3930 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3931 warn "jitter $JITTER\n";#d#
3932 }
3337 }, 3933 }
3338); 3934}
3339 3935
3340{ 3936{
3341 BDB::max_poll_time $TICK * 0.1; 3937 # configure BDB
3342 $BDB_POLL_WATCHER = Event->io ( 3938
3343 reentrant => 0,
3344 fd => BDB::poll_fileno,
3345 poll => 'r',
3346 prio => 0,
3347 data => WF_AUTOCANCEL,
3348 cb => \&BDB::poll_cb,
3349 );
3350 BDB::min_parallel 8; 3939 BDB::min_parallel 8;
3351 3940 BDB::max_poll_reqs $TICK * 0.1;
3352 BDB::set_sync_prepare { 3941 $AnyEvent::BDB::WATCHER->priority (1);
3353 my $status;
3354 my $current = $Coro::current;
3355 (
3356 sub {
3357 $status = $!;
3358 $current->ready; undef $current;
3359 },
3360 sub {
3361 Coro::schedule while defined $current;
3362 $! = $status;
3363 },
3364 )
3365 };
3366 3942
3367 unless ($DB_ENV) { 3943 unless ($DB_ENV) {
3368 $DB_ENV = BDB::db_env_create; 3944 $DB_ENV = BDB::db_env_create;
3945 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3946 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3947 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3948 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3949 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3369 3950
3370 cf::sync_job { 3951 cf::sync_job {
3371 eval { 3952 eval {
3372 BDB::db_env_open 3953 BDB::db_env_open
3373 $DB_ENV, 3954 $DB_ENV,
… …
3375 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3956 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3376 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3957 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3377 0666; 3958 0666;
3378 3959
3379 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3960 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3380
3381 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3382 $DB_ENV->set_lk_detect;
3383 }; 3961 };
3384 3962
3385 cf::cleanup "db_env_open(db): $@" if $@; 3963 cf::cleanup "db_env_open(db): $@" if $@;
3386 }; 3964 };
3387 } 3965 }
3966
3967 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3968 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3969 };
3970 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3971 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3972 };
3973 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3974 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3975 };
3388} 3976}
3389 3977
3390{ 3978{
3979 # configure IO::AIO
3980
3391 IO::AIO::min_parallel 8; 3981 IO::AIO::min_parallel 8;
3392
3393 undef $Coro::AIO::WATCHER;
3394 IO::AIO::max_poll_time $TICK * 0.1; 3982 IO::AIO::max_poll_time $TICK * 0.1;
3395 $AIO_POLL_WATCHER = Event->io ( 3983 undef $AnyEvent::AIO::WATCHER;
3396 reentrant => 0,
3397 data => WF_AUTOCANCEL,
3398 fd => IO::AIO::poll_fileno,
3399 poll => 'r',
3400 prio => 6,
3401 cb => \&IO::AIO::poll_cb,
3402 );
3403} 3984}
3404 3985
3405my $_log_backtrace; 3986my $_log_backtrace;
3406 3987
3407sub _log_backtrace { 3988sub _log_backtrace {
… …
3410 $msg =~ s/\n//; 3991 $msg =~ s/\n//;
3411 3992
3412 # limit the # of concurrent backtraces 3993 # limit the # of concurrent backtraces
3413 if ($_log_backtrace < 2) { 3994 if ($_log_backtrace < 2) {
3414 ++$_log_backtrace; 3995 ++$_log_backtrace;
3996 my $perl_bt = Carp::longmess $msg;
3415 async { 3997 async {
3998 $Coro::current->{desc} = "abt $msg";
3999
3416 my @bt = fork_call { 4000 my @bt = fork_call {
3417 @addr = map { sprintf "%x", $_ } @addr; 4001 @addr = map { sprintf "%x", $_ } @addr;
3418 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4002 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3419 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4003 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3420 or die "addr2line: $!"; 4004 or die "addr2line: $!";
… …
3428 } 4012 }
3429 4013
3430 @funcs 4014 @funcs
3431 }; 4015 };
3432 4016
3433 LOG llevInfo, "[ABT] $msg\n"; 4017 LOG llevInfo, "[ABT] $perl_bt\n";
4018 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3434 LOG llevInfo, "[ABT] $_\n" for @bt; 4019 LOG llevInfo, "[ABT] $_\n" for @bt;
3435 --$_log_backtrace; 4020 --$_log_backtrace;
3436 }; 4021 };
3437 } else { 4022 } else {
3438 LOG llevInfo, "[ABT] $msg\n"; 4023 LOG llevInfo, "[ABT] $msg\n";
3439 LOG llevInfo, "[ABT] [suppressed]\n"; 4024 LOG llevInfo, "[ABT] [suppressed]\n";
3440 } 4025 }
3441} 4026}
3442 4027
3443# load additional modules 4028# load additional modules
3444use cf::pod; 4029require "cf/$_.pm" for @EXTRA_MODULES;
4030cf::_connect_to_perl_2;
3445 4031
3446END { cf::emergency_save } 4032END { cf::emergency_save }
3447 4033
34481 40341
3449 4035

Diff Legend

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