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

Diff Legend

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