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

Diff Legend

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