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.342 by root, Sun Aug 26 15:31:02 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}
… …
1166 1339
1167 cf::override; 1340 cf::override;
1168 }, 1341 },
1169); 1342);
1170 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}
1356
1171sub load_extensions { 1357sub load_extensions {
1172 cf::sync_job { 1358 cf::sync_job {
1173 my %todo; 1359 my %todo;
1174 1360
1175 for my $path (<$LIBDIR/*.ext>) { 1361 for my $path (<$LIBDIR/*.ext>) {
… …
1194 1380
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1381 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1382 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197 1383
1198 $ext{source} = 1384 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n" 1385 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1200 . "#line 1 \"$path\"\n{\n" 1386 . "#line 1 \"$path\"\n{\n"
1201 . $source 1387 . $source
1202 . "\n};\n1"; 1388 . "\n};\n1";
1203 1389
1204 $todo{$base} = \%ext; 1390 $todo{$base} = \%ext;
… …
1220 my $msg = $@ ? "$v->{path}: $@\n" 1406 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n"; 1407 : "$v->{base}: extension inactive.\n";
1222 1408
1223 if (exists $v->{meta}{mandatory}) { 1409 if (exists $v->{meta}{mandatory}) {
1224 warn $msg; 1410 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n"; 1411 cf::cleanup "mandatory extension failed to load, exiting.";
1226 exit 1;
1227 } 1412 }
1228 1413
1229 warn $msg; 1414 warn $msg;
1230 } 1415 }
1231 1416
… …
1245 1430
1246=back 1431=back
1247 1432
1248=head2 CORE EXTENSIONS 1433=head2 CORE EXTENSIONS
1249 1434
1250Functions and methods that extend core crossfire objects. 1435Functions and methods that extend core deliantra objects.
1251 1436
1252=cut 1437=cut
1253 1438
1254package cf::player; 1439package cf::player;
1255 1440
1256use Coro::AIO; 1441use Coro::AIO;
1257 1442
1258=head3 cf::player 1443=head3 cf::player
1259 1444
1260=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}
1261 1460
1262=item cf::player::find $login 1461=item cf::player::find $login
1263 1462
1264Returns the given player object, loading it if necessary (might block). 1463Returns the given player object, loading it if necessary (might block).
1265 1464
… …
1284 1483
1285sub exists($) { 1484sub exists($) {
1286 my ($login) = @_; 1485 my ($login) = @_;
1287 1486
1288 $cf::PLAYER{$login} 1487 $cf::PLAYER{$login}
1289 or cf::sync_job { !aio_stat path $login } 1488 or !aio_stat path $login
1290} 1489}
1291 1490
1292sub find($) { 1491sub find($) {
1293 return $cf::PLAYER{$_[0]} || do { 1492 return $cf::PLAYER{$_[0]} || do {
1294 my $login = $_[0]; 1493 my $login = $_[0];
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1500 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1501 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1502 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1503 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1504
1306 my $pl = load_pl path $login 1505 my $f = new_from_file cf::object::thawer path $login
1307 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;
1308 $cf::PLAYER{$login} = $pl 1513 $cf::PLAYER{$login} = $pl
1309 } 1514 }
1310 } 1515 }
1311} 1516}
1312 1517
… …
1321 return if $pl->{deny_save}; 1526 return if $pl->{deny_save};
1322 1527
1323 aio_mkdir playerdir $pl, 0770; 1528 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1529 $pl->{last_save} = $cf::RUNTIME;
1325 1530
1531 cf::get_slot 0.01;
1532
1326 $pl->save_pl ($path); 1533 $pl->save_pl ($path);
1327 Coro::cede; 1534 cf::cede_to_tick;
1328} 1535}
1329 1536
1330sub new($) { 1537sub new($) {
1331 my ($login) = @_; 1538 my ($login) = @_;
1332 1539
… …
1361 my ($pl) = @_; 1568 my ($pl) = @_;
1362 1569
1363 my $name = $pl->ob->name; 1570 my $name = $pl->ob->name;
1364 1571
1365 $pl->{deny_save} = 1; 1572 $pl->{deny_save} = 1;
1366 $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
1367 1574
1368 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1575 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1369 $pl->deactivate; 1576 $pl->deactivate;
1577 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1578 $pl->ob->check_score;
1370 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1579 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1371 $pl->ns->destroy if $pl->ns; 1580 $pl->ns->destroy if $pl->ns;
1372 1581
1373 my $path = playerdir $pl; 1582 my $path = playerdir $pl;
1374 my $temp = "$path~$cf::RUNTIME~deleting~"; 1583 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1410 or return []; 1619 or return [];
1411 1620
1412 my @logins; 1621 my @logins;
1413 1622
1414 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") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1629 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1630 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1631 $buf !~ /^password -------------$/m or next; # official not-valid tag
1632 }
1418 1633
1419 utf8::decode $login; 1634 utf8::decode $login;
1420 push @logins, $login; 1635 push @logins, $login;
1421 } 1636 }
1422 1637
… …
1449 } 1664 }
1450 1665
1451 \@paths 1666 \@paths
1452} 1667}
1453 1668
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1669=item $protocol_xml = $player->expand_cfpod ($cfpod)
1455 1670
1456Expand crossfire pod fragments into protocol xml. 1671Expand deliantra pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503 1672
1504=item $player->ext_reply ($msgid, @msg) 1673=item $player->ext_reply ($msgid, @msg)
1505 1674
1506Sends an ext reply to the player. 1675Sends an ext reply to the player.
1507 1676
… …
1574our $MAX_RESET = 3600; 1743our $MAX_RESET = 3600;
1575our $DEFAULT_RESET = 3000; 1744our $DEFAULT_RESET = 3000;
1576 1745
1577sub generate_random_map { 1746sub generate_random_map {
1578 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
1579 # mit "rum" bekleckern, nicht 1751 # mit "rum" bekleckern, nicht
1580 $self->_create_random_map ( 1752 $self->_create_random_map (
1581 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1582 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1583 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1705 1877
1706# the temporary/swap location 1878# the temporary/swap location
1707sub save_path { 1879sub save_path {
1708 my ($self) = @_; 1880 my ($self) = @_;
1709 1881
1710 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1882 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1711 "$TMPDIR/$path.map" 1883 "$TMPDIR/$path.map"
1712} 1884}
1713 1885
1714# the unique path, undef == no special unique path 1886# the unique path, undef == no special unique path
1715sub uniq_path { 1887sub uniq_path {
1716 my ($self) = @_; 1888 my ($self) = @_;
1717 1889
1718 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1890 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1719 "$UNIQUEDIR/$path" 1891 "$UNIQUEDIR/$path"
1720}
1721
1722# and all this just because we cannot iterate over
1723# all maps in C++...
1724sub change_all_map_light {
1725 my ($change) = @_;
1726
1727 $_->change_map_light ($change)
1728 for grep $_->outdoor, values %cf::MAP;
1729} 1892}
1730 1893
1731sub decay_objects { 1894sub decay_objects {
1732 my ($self) = @_; 1895 my ($self) = @_;
1733 1896
… …
1746 1909
1747sub load_header_from($) { 1910sub load_header_from($) {
1748 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1749 1912
1750 utf8::encode $path; 1913 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 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;
1756 1922
1757 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1758 1924
1759 1 1925 1
1760} 1926}
… …
1814sub find { 1980sub find {
1815 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1816 1982
1817 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1818 1984
1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1986 my $guard2 = cf::lock_acquire "map_find:$path";
1820 1987
1821 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path";
1823 my $map = new_from_path cf::map $path 1989 my $map = new_from_path cf::map $path
1824 or return; 1990 or return;
1825 1991
1826 $map->{last_save} = $cf::RUNTIME; 1992 $map->{last_save} = $cf::RUNTIME;
1827 1993
… …
1829 or return; 1995 or return;
1830 1996
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1997 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1998 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1999 #$cf::WAIT_FOR_TICK->wait;
2000 undef $guard2;
2001 undef $guard1;
1834 $map->reset; 2002 $map->reset;
1835 undef $guard;
1836 return find $path; 2003 return find $path;
1837 } 2004 }
1838 2005
1839 $cf::MAP{$path} = $map 2006 $cf::MAP{$path} = $map
1840 } 2007 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 2016 local $self->{deny_reset} = 1; # loading can take a long time
1850 2017
1851 my $path = $self->{path}; 2018 my $path = $self->{path};
1852 2019
1853 { 2020 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2021 my $guard = cf::lock_acquire "map_data:$path";
1855 2022
2023 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2024 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2025
1858 $self->in_memory (cf::MAP_LOADING); 2026 $self->in_memory (cf::MAP_LOADING);
1859 2027
1860 $self->alloc; 2028 $self->alloc;
1861 2029
1862 $self->pre_load; 2030 $self->pre_load;
1863 Coro::cede; 2031 cf::cede_to_tick;
1864 2032
2033 my $f = new_from_file cf::object::thawer $self->{load_path};
2034 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2035 $self->_load_objects ($f)
1866 or return; 2036 or return;
1867 2037
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2038 $self->post_load_original
1869 if delete $self->{load_original}; 2039 if delete $self->{load_original};
1870 2040
1871 if (my $uniq = $self->uniq_path) { 2041 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2042 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2043 unless (aio_stat $uniq) {
2044 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2045 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2046 $self->_load_objects ($f);
2047 $f->resolve_delayed_derefs;
2048 }
1876 } 2049 }
1877 } 2050 }
1878 2051
1879 Coro::cede; 2052 $f->resolve_delayed_derefs;
2053
2054 cf::cede_to_tick;
1880 # now do the right thing for maps 2055 # now do the right thing for maps
1881 $self->link_multipart_objects; 2056 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2057 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2058 unless $self->difficulty;
1884 Coro::cede; 2059 cf::cede_to_tick;
1885 2060
1886 unless ($self->{deny_activate}) { 2061 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2062 $self->decay_objects;
1888 $self->fix_auto_apply; 2063 $self->fix_auto_apply;
1889 $self->update_buttons; 2064 $self->update_buttons;
1890 Coro::cede; 2065 cf::cede_to_tick;
1891 $self->set_darkness_map;
1892 Coro::cede;
1893 $self->activate; 2066 $self->activate;
1894 } 2067 }
1895 2068
1896 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2070 $self->last_access ($cf::RUNTIME);
1898 2071
1899 $self->in_memory (cf::MAP_IN_MEMORY); 2072 $self->in_memory (cf::MAP_ACTIVE);
1900 } 2073 }
1901 2074
1902 $self->post_load; 2075 $self->post_load;
1903} 2076}
1904 2077
… …
1962 my ($path, $origin, $load) = @_; 2135 my ($path, $origin, $load) = @_;
1963 2136
1964 $path = normalise $path, $origin && $origin->{path}; 2137 $path = normalise $path, $origin && $origin->{path};
1965 2138
1966 if (my $map = $cf::MAP{$path}) { 2139 if (my $map = $cf::MAP{$path}) {
1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2140 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2141 }
1969 2142
1970 $MAP_PREFETCH{$path} |= $load; 2143 $MAP_PREFETCH{$path} |= $load;
1971 2144
1972 $MAP_PREFETCHER ||= cf::async { 2145 $MAP_PREFETCHER ||= cf::async {
2146 $Coro::current->{desc} = "map prefetcher";
2147
1973 while (%MAP_PREFETCH) { 2148 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2149 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2150 if (my $map = find $k) {
1976 $map->load if $v; 2151 $map->load if $v;
1977 } 2152 }
… …
1987} 2162}
1988 2163
1989sub save { 2164sub save {
1990 my ($self) = @_; 2165 my ($self) = @_;
1991 2166
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2168
1994 $self->{last_save} = $cf::RUNTIME; 2169 $self->{last_save} = $cf::RUNTIME;
1995 2170
1996 return unless $self->dirty; 2171 return unless $self->dirty;
1997 2172
… …
2003 return if $self->{deny_save}; 2178 return if $self->{deny_save};
2004 2179
2005 local $self->{last_access} = $self->last_access;#d# 2180 local $self->{last_access} = $self->last_access;#d#
2006 2181
2007 cf::async { 2182 cf::async {
2183 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2184 $_->contr->save for $self->players;
2009 }; 2185 };
2186
2187 cf::get_slot 0.02;
2010 2188
2011 if ($uniq) { 2189 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2190 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2013 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2191 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2014 } else { 2192 } else {
… …
2020 my ($self) = @_; 2198 my ($self) = @_;
2021 2199
2022 # save first because save cedes 2200 # save first because save cedes
2023 $self->save; 2201 $self->save;
2024 2202
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2204
2027 return if $self->players; 2205 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2206 return if $self->in_memory != cf::MAP_ACTIVE;
2029 return if $self->{deny_save}; 2207 return if $self->{deny_save};
2030 2208
2209 $self->in_memory (cf::MAP_SWAPPED);
2210
2211 $self->deactivate;
2212 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2213 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2214}
2034 2215
2035sub reset_at { 2216sub reset_at {
2036 my ($self) = @_; 2217 my ($self) = @_;
2037 2218
… …
2055 2236
2056 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2057 2238
2058 return if $self->players; 2239 return if $self->players;
2059 2240
2060 warn "resetting map ", $self->path; 2241 warn "resetting map ", $self->path, "\n";
2061 2242
2062 $self->in_memory (cf::MAP_SWAPPED); 2243 $self->in_memory (cf::MAP_SWAPPED);
2063 2244
2064 # need to save uniques path 2245 # need to save uniques path
2065 unless ($self->{deny_save}) { 2246 unless ($self->{deny_save}) {
… …
2069 if $uniq; 2250 if $uniq;
2070 } 2251 }
2071 2252
2072 delete $cf::MAP{$self->path}; 2253 delete $cf::MAP{$self->path};
2073 2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2257 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2258
2078 $self->unlink_save; 2259 $self->unlink_save;
2079 $self->destroy; 2260 $self->destroy;
2080} 2261}
2081 2262
2082my $nuke_counter = "aaaa"; 2263my $nuke_counter = "aaaa";
2083 2264
2084sub nuke { 2265sub nuke {
2085 my ($self) = @_; 2266 my ($self) = @_;
2086 2267
2268 {
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2087 delete $cf::MAP{$self->path}; 2271 delete $cf::MAP{$self->path};
2088 2272
2089 $self->unlink_save; 2273 $self->unlink_save;
2090 2274
2091 bless $self, "cf::map"; 2275 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2276 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2277 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2278 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2279 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2280
2097 $cf::MAP{$self->path} = $self; 2281 $cf::MAP{$self->path} = $self;
2282 }
2098 2283
2099 $self->reset; # polite request, might not happen 2284 $self->reset; # polite request, might not happen
2100} 2285}
2101 2286
2102=item $maps = cf::map::tmp_maps 2287=item $maps = cf::map::tmp_maps
… …
2144 2329
2145sub unique_maps() { 2330sub unique_maps() {
2146 [ 2331 [
2147 map { 2332 map {
2148 utf8::decode $_; 2333 utf8::decode $_;
2149 /\.map$/ 2334 s/\.map$//; # TODO future compatibility hack
2335 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2336 ? ()
2150 ? normalise $_ 2337 : normalise $_
2151 : ()
2152 } @{ aio_readdir $UNIQUEDIR or [] } 2338 } @{ aio_readdir $UNIQUEDIR or [] }
2153 ] 2339 ]
2154} 2340}
2155 2341
2156package cf;
2157
2158=back 2342=back
2159 2343
2160=head3 cf::object 2344=head3 cf::object
2161 2345
2162=cut 2346=cut
… …
2165 2349
2166=over 4 2350=over 4
2167 2351
2168=item $ob->inv_recursive 2352=item $ob->inv_recursive
2169 2353
2170Returns 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.
2171 2356
2172=cut 2357=cut
2173 2358
2174sub inv_recursive_; 2359sub inv_recursive_;
2175sub inv_recursive_ { 2360sub inv_recursive_ {
… …
2178 2363
2179sub inv_recursive { 2364sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2365 inv_recursive_ inv $_[0]
2181} 2366}
2182 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
2183package cf; 2396package cf;
2184 2397
2185=back 2398=back
2186 2399
2187=head3 cf::object::player 2400=head3 cf::object::player
… …
2193Sends 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>
2194can 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
2195dialogue with the given NPC character. 2408dialogue with the given NPC character.
2196 2409
2197=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};
2198 2425
2199# rough implementation of a future "reply" method that works 2426# rough implementation of a future "reply" method that works
2200# with dialog boxes. 2427# with dialog boxes.
2201#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
2202sub cf::object::player::reply($$$;$) { 2429sub cf::object::player::reply($$$;$) {
… …
2214 my $dialog = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2215 $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));
2216 2443
2217 } else { 2444 } else {
2218 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2219 $self->message ($msg, $flags); 2446 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2220 } 2447 }
2221 } 2448 }
2222} 2449}
2223 2450
2224=item $object->send_msg ($channel, $msg, $color, [extra...]) 2451=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2249 2476
2250=item $player_object->enter_link 2477=item $player_object->enter_link
2251 2478
2252Freezes 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}>).
2253 2480
2254The 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.
2255I<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.
2256 2485
2257Will never block. 2486Will never block.
2258 2487
2259=item $player_object->leave_link ($map, $x, $y) 2488=item $player_object->leave_link ($map, $x, $y)
2260 2489
… …
2318 2547
2319 $map->load; 2548 $map->load;
2320 $map->load_neighbours; 2549 $map->load_neighbours;
2321 2550
2322 return unless $self->contr->active; 2551 return unless $self->contr->active;
2323 $self->activate_recursive;
2324 2552
2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2326 $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;
2327} 2558}
2328 2559
2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2330 2561
2331Moves 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
2332her, loading and preparing them map, calling the provided $check callback 2563her, loading and preparing them map, calling the provided $check callback
2333that 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
2334the 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
2335be called at the end of this process. 2566be called at the end of this process.
2336 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
2337=cut 2571=cut
2338 2572
2339our $GOTOGEN; 2573our $GOTOGEN;
2340 2574
2341sub cf::object::player::goto { 2575sub cf::object::player::goto {
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2579 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2580
2347 $self->enter_link; 2581 $self->enter_link;
2348 2582
2349 (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
2350 my $map = eval { 2605 my $map = eval {
2351 my $map = cf::map::find $path; 2606 my $map = defined $path ? cf::map::find $path : undef;
2352 2607
2353 if ($map) { 2608 if ($map) {
2354 $map = $map->customise_for ($self); 2609 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2610 $map = $check->($map) if $check && $map;
2356 } else { 2611 } else {
2357 $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);
2358 } 2613 }
2359 2614
2360 $map 2615 $map
2361 }; 2616 };
2362 2617
… …
2398} 2653}
2399 2654
2400sub prepare_random_map { 2655sub prepare_random_map {
2401 my ($exit) = @_; 2656 my ($exit) = @_;
2402 2657
2403 my $guard = cf::lock_acquire "exit_prepare:$exit";
2404
2405 # all this does is basically replace the /! path by 2658 # all this does is basically replace the /! path by
2406 # a new random map path (?random/...) with a seed 2659 # a new random map path (?random/...) with a seed
2407 # that depends on the exit object 2660 # that depends on the exit object
2408 2661
2409 my $rmp = parse_random_map_params $exit->msg; 2662 my $rmp = parse_random_map_params $exit->msg;
… …
2411 if ($exit->map) { 2664 if ($exit->map) {
2412 $rmp->{region} = $exit->region->name; 2665 $rmp->{region} = $exit->region->name;
2413 $rmp->{origin_map} = $exit->map->path; 2666 $rmp->{origin_map} = $exit->map->path;
2414 $rmp->{origin_x} = $exit->x; 2667 $rmp->{origin_x} = $exit->x;
2415 $rmp->{origin_y} = $exit->y; 2668 $rmp->{origin_y} = $exit->y;
2669
2670 $exit->map->touch;
2416 } 2671 }
2417 2672
2418 $rmp->{random_seed} ||= $exit->random_seed; 2673 $rmp->{random_seed} ||= $exit->random_seed;
2419 2674
2420 my $data = cf::to_json $rmp; 2675 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2421 my $md5 = Digest::MD5::md5_hex $data; 2676 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2677 my $meta = "$RANDOMDIR/$md5.meta";
2423 2678
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2679 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2680 aio_write $fh, 0, (length $data), $data, 0;
2426 undef $fh; 2681 undef $fh;
2427 aio_rename "$meta~", $meta; 2682 aio_rename "$meta~", $meta;
2428 2683
2684 my $slaying = "?random/$md5";
2685
2686 if ($exit->valid) {
2429 $exit->slaying ("?random/$md5"); 2687 $exit->slaying ("?random/$md5");
2430 $exit->msg (undef); 2688 $exit->msg (undef);
2689 }
2431 } 2690 }
2432} 2691}
2433 2692
2434sub cf::object::player::enter_exit { 2693sub cf::object::player::enter_exit {
2435 my ($self, $exit) = @_; 2694 my ($self, $exit) = @_;
2436 2695
2437 return unless $self->type == cf::PLAYER; 2696 return unless $self->type == cf::PLAYER;
2438 2697
2439 if ($exit->slaying eq "/!") {
2440 #TODO: this should de-fi-ni-te-ly not be a sync-job
2441 # the problem is that $exit might not survive long enough
2442 # so it needs to be done right now, right here
2443 cf::sync_job { prepare_random_map $exit };
2444 }
2445
2446 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2447 my $hp = $exit->stats->hp;
2448 my $sp = $exit->stats->sp;
2449
2450 $self->enter_link; 2698 $self->enter_link;
2451 2699
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2456 (async { 2700 (async {
2457 $self->deactivate_recursive; # just to be sure 2701 $Coro::current->{desc} = "enter_exit";
2702
2458 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
2459 $self->goto ($slaying, $hp, $sp); 2718 $self->goto ($map, $x, $y);
2460 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
2461 1; 2724 1
2462 }) { 2725 }) {
2463 $self->message ("Something went wrong deep within the crossfire server. " 2726 $self->message ("Something went wrong deep within the deliantra server. "
2464 . "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. "
2465 . "Please report this to the dungeon master!", 2728 . "Please report this to the dungeon master!",
2466 cf::NDI_UNIQUE | cf::NDI_RED); 2729 cf::NDI_UNIQUE | cf::NDI_RED);
2467 2730
2468 warn "ERROR in enter_exit: $@"; 2731 warn "ERROR in enter_exit: $@";
… …
2496the 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
2497the message unless the client supports the msg packet. 2760the message unless the client supports the msg packet.
2498 2761
2499=cut 2762=cut
2500 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
2501sub cf::client::send_msg { 2866sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2867 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2868
2504 $msg = $self->pl->expand_cfpod ($msg); 2869 $msg = $self->pl->expand_cfpod ($msg)
2870 unless $color & cf::NDI_VERBATIM;
2505 2871
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2872 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 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
2508 if (ref $channel) { 2881 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2882 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2883 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2884 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2885 $self->ext_msg (channel_info => $channel);
2513 } 2886 }
… …
2515 $channel = $channel->{id}; 2888 $channel = $channel->{id};
2516 } 2889 }
2517 2890
2518 return unless @extra || length $msg; 2891 return unless @extra || length $msg;
2519 2892
2520 if ($self->can_msg) {
2521 # default colour, mask it out 2893 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2894 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF; 2895 if $color & cf::NDI_DEF;
2524 2896
2525 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2897 my $pkt = "msg "
2898 . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2527 } else { 2900 );
2528 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones
2530 for ($msg) {
2531 1 while
2532 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2533 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2534 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2535 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2536 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2537 }
2538 2901
2539 $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};
2540 2905
2541 utf8::encode $msg; 2906 # split very large packets
2542 2907 if (8192 < length $pkt and $self->{can_lzf}) {
2543 if (0 && $msg =~ /\[/) { 2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2544 # COMMAND/INFO 2909 $pkt = "frag";
2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2546 } else {
2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2548 $self->send_packet ("drawinfo $color $msg")
2549 }
2550 }
2551 } 2910 }
2911
2912 $self->send_packet ($pkt);
2552} 2913}
2553 2914
2554=item $client->ext_msg ($type, @msg) 2915=item $client->ext_msg ($type, @msg)
2555 2916
2556Sends an ext event to the client. 2917Sends an ext event to the client.
… …
2558=cut 2919=cut
2559 2920
2560sub cf::client::ext_msg($$@) { 2921sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2922 my ($self, $type, @msg) = @_;
2562 2923
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2924 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2926 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2927 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2929 }
2571} 2930}
2572 2931
… …
2579sub cf::client::ext_reply($$@) { 2938sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2939 my ($self, $id, @msg) = @_;
2581 2940
2582 if ($self->extcmd == 2) { 2941 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2942 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2943 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2944 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2945 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2947 }
2589} 2948}
… …
2731=pod 3090=pod
2732 3091
2733The following functions and methods are available within a safe environment: 3092The following functions and methods are available within a safe environment:
2734 3093
2735 cf::object 3094 cf::object
2736 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
2737 insert remove name archname title slaying race decrease_ob_nr 3096 insert remove name archname title slaying race decrease split
3097 value
2738 3098
2739 cf::object::player 3099 cf::object::player
2740 player 3100 player
2741 3101
2742 cf::player 3102 cf::player
… …
2747 3107
2748=cut 3108=cut
2749 3109
2750for ( 3110for (
2751 ["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
2752 insert remove inv name archname title slaying race 3112 insert remove inv nrof name archname title slaying race
2753 decrease_ob_nr)], 3113 decrease split destroy change_exp value msg lore send_msg)],
2754 ["cf::object::player" => qw(player)], 3114 ["cf::object::player" => qw(player)],
2755 ["cf::player" => qw(peaceful)], 3115 ["cf::player" => qw(peaceful send_msg)],
2756 ["cf::map" => qw(trigger)], 3116 ["cf::map" => qw(trigger)],
2757) { 3117) {
2758 no strict 'refs'; 3118 no strict 'refs';
2759 my ($pkg, @funs) = @$_; 3119 my ($pkg, @funs) = @$_;
2760 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2777 my ($code, %vars) = @_; 3137 my ($code, %vars) = @_;
2778 3138
2779 my $qcode = $code; 3139 my $qcode = $code;
2780 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2781 $qcode =~ s/\n/\\n/g; 3141 $qcode =~ s/\n/\\n/g;
3142
3143 %vars = (_dummy => 0) unless %vars;
2782 3144
2783 local $_; 3145 local $_;
2784 local @safe::cf::_safe_eval_args = values %vars; 3146 local @safe::cf::_safe_eval_args = values %vars;
2785 3147
2786 my $eval = 3148 my $eval =
… …
2834# the server's init and main functions 3196# the server's init and main functions
2835 3197
2836sub load_facedata($) { 3198sub load_facedata($) {
2837 my ($path) = @_; 3199 my ($path) = @_;
2838 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
2839 my $enc = JSON::XS->new->utf8->canonical; 3205 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3206
2841 warn "loading facedata from $path\n"; 3207 warn "loading facedata from $path\n";
2842 3208
2843 my $facedata; 3209 my $facedata;
2844 0 < aio_load $path, $facedata 3210 0 < aio_load $path, $facedata
… …
2859 { 3225 {
2860 my $faces = $facedata->{faceinfo}; 3226 my $faces = $facedata->{faceinfo};
2861 3227
2862 while (my ($face, $info) = each %$faces) { 3228 while (my ($face, $info) = each %$faces) {
2863 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3229 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230
2864 cf::face::set_visibility $idx, $info->{visibility}; 3231 cf::face::set_visibility $idx, $info->{visibility};
2865 cf::face::set_magicmap $idx, $info->{magicmap}; 3232 cf::face::set_magicmap $idx, $info->{magicmap};
2866 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};
2867 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};
2868 3235
2869 cf::cede_to_tick; 3236 cf::cede_to_tick;
2870 } 3237 }
2871 3238
2872 while (my ($face, $info) = each %$faces) { 3239 while (my ($face, $info) = each %$faces) {
2873 next unless $info->{smooth}; 3240 next unless $info->{smooth};
3241
2874 my $idx = cf::face::find $face 3242 my $idx = cf::face::find $face
2875 or next; 3243 or next;
3244
2876 if (my $smooth = cf::face::find $info->{smooth}) { 3245 if (my $smooth = cf::face::find $info->{smooth}) {
2877 cf::face::set_smooth $idx, $smooth; 3246 cf::face::set_smooth $idx, $smooth;
2878 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2879 } else { 3248 } else {
2880 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3249 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2898 { 3267 {
2899 # TODO: for gcfclient pleasure, we should give resources 3268 # TODO: for gcfclient pleasure, we should give resources
2900 # that gcfclient doesn't grok a >10000 face index. 3269 # that gcfclient doesn't grok a >10000 face index.
2901 my $res = $facedata->{resource}; 3270 my $res = $facedata->{resource};
2902 3271
2903 my $soundconf = delete $res->{"res/sound.conf"};
2904
2905 while (my ($name, $info) = each %$res) { 3272 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) {
2906 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3274 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2907 my $data; 3275 my $data;
2908 3276
2909 if ($info->{type} & 1) { 3277 if ($info->{type} & 1) {
2910 # prepend meta info 3278 # prepend meta info
2911 3279
2912 my $meta = $enc->encode ({ 3280 my $meta = $enc->encode ({
2913 name => $name, 3281 name => $name,
2914 %{ $info->{meta} || {} }, 3282 %{ $info->{meta} || {} },
2915 }); 3283 });
2916 3284
2917 $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};
2918 } else { 3292 } else {
2919 $data = $info->{data}; 3293 $RESOURCE{$name} = $info;
2920 } 3294 }
2921 3295
2922 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2923 cf::face::set_type $idx, $info->{type};
2924
2925 cf::cede_to_tick; 3296 cf::cede_to_tick;
2926 } 3297 }
2927
2928 if ($soundconf) {
2929 $soundconf = $enc->decode (delete $soundconf->{data});
2930
2931 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2932 my $sound = $soundconf->{compat}[$_]
2933 or next;
2934
2935 my $face = cf::face::find "sound/$sound->[1]";
2936 cf::sound::set $sound->[0] => $face;
2937 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2938 }
2939
2940 while (my ($k, $v) = each %{$soundconf->{event}}) {
2941 my $face = cf::face::find "sound/$v";
2942 cf::sound::set $k => $face;
2943 }
2944 }
2945 } 3298 }
3299
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2946 3301
2947 1 3302 1
2948} 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});
2949 3324
2950register_exticmd fx_want => sub { 3325register_exticmd fx_want => sub {
2951 my ($ns, $want) = @_; 3326 my ($ns, $want) = @_;
2952 3327
2953 while (my ($k, $v) = each %$want) { 3328 while (my ($k, $v) = each %$want) {
2954 $ns->fx_want ($k, $v); 3329 $ns->fx_want ($k, $v);
2955 } 3330 }
2956}; 3331};
2957 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
2958sub 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
2959 load_resource_file "$MAPDIR/regions" 3348 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3349 or die "unable to load regions file\n";
2961 3350
2962 for (cf::region::list) { 3351 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3352 $_->{match} = qr/$_->{match}/
… …
2971} 3360}
2972 3361
2973sub reload_archetypes { 3362sub reload_archetypes {
2974 load_resource_file "$DATADIR/archetypes" 3363 load_resource_file "$DATADIR/archetypes"
2975 or die "unable to load archetypes\n"; 3364 or die "unable to load archetypes\n";
2976 #d# NEED to laod twice to resolve forward references
2977 # this really needs to be done in an extra post-pass
2978 # (which needs to be synchronous, so solve it differently)
2979 load_resource_file "$DATADIR/archetypes"
2980 or die "unable to load archetypes\n";
2981} 3365}
2982 3366
2983sub reload_treasures { 3367sub reload_treasures {
2984 load_resource_file "$DATADIR/treasures" 3368 load_resource_file "$DATADIR/treasures"
2985 or die "unable to load treasurelists\n"; 3369 or die "unable to load treasurelists\n";
2986} 3370}
2987 3371
2988sub reload_resources { 3372sub reload_resources {
2989 warn "reloading resource files...\n"; 3373 warn "reloading resource files...\n";
2990 3374
3375 reload_facedata;
3376 reload_archetypes;
2991 reload_regions; 3377 reload_regions;
2992 reload_facedata;
2993 #reload_archetypes;#d#
2994 reload_archetypes;
2995 reload_treasures; 3378 reload_treasures;
2996 3379
2997 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
2998} 3381}
2999 3382
3000sub init { 3383sub reload_config {
3001 reload_resources;
3002}
3003
3004sub cfg_load {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3385 or return;
3007 3386
3008 local $/; 3387 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3388 *CFG = YAML::Load <$fh>;
3010 3389
3011 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3012 3391
3013 $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};
3014 $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};
… …
3020 }; 3399 };
3021 warn $@ if $@; 3400 warn $@ if $@;
3022 } 3401 }
3023} 3402}
3024 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
3025sub 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
3026 # we must not ever block the main coroutine 3447 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3448 local $Coro::idle = sub {
3028 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#
3029 (async { 3450 (async {
3030 Event::one_event; 3451 $Coro::current->{desc} = "IDLE BUG HANDLER";
3452 EV::loop EV::LOOP_ONESHOT;
3031 })->prio (Coro::PRIO_MAX); 3453 })->prio (Coro::PRIO_MAX);
3032 }; 3454 };
3033 3455
3034 cfg_load; 3456 evthread_start IO::AIO::poll_fileno;
3457
3458 cf::sync_job {
3459 reload_resources;
3460 reload_config;
3035 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
3036 load_extensions; 3474 load_extensions;
3037 3475
3038 $TICK_WATCHER->start; 3476 utime time, time, $RUNTIMEFILE;
3039 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;
3040} 3486}
3041 3487
3042############################################################################# 3488#############################################################################
3043# initialisation and cleanup 3489# initialisation and cleanup
3044 3490
3045# install some emergency cleanup handlers 3491# install some emergency cleanup handlers
3046BEGIN { 3492BEGIN {
3493 our %SIGWATCHER = ();
3047 for my $signal (qw(INT HUP TERM)) { 3494 for my $signal (qw(INT HUP TERM)) {
3048 Event->signal ( 3495 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 signal => $signal,
3052 prio => 0,
3053 cb => sub {
3054 cf::cleanup "SIG$signal"; 3496 cf::cleanup "SIG$signal";
3055 },
3056 ); 3497 };
3057 } 3498 }
3058} 3499}
3059 3500
3060sub write_runtime { 3501sub write_runtime_sync {
3061 my $runtime = "$LOCALDIR/runtime";
3062
3063 # first touch the runtime file to show we are still running: 3502 # first touch the runtime file to show we are still running:
3064 # the fsync below can take a very very long time. 3503 # the fsync below can take a very very long time.
3065 3504
3066 IO::AIO::aio_utime $runtime, undef, undef; 3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3067 3506
3068 my $guard = cf::lock_acquire "write_runtime"; 3507 my $guard = cf::lock_acquire "write_runtime";
3069 3508
3070 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3071 or return; 3510 or return;
3072 3511
3073 my $value = $cf::RUNTIME + 90 + 10; 3512 my $value = $cf::RUNTIME + 90 + 10;
3074 # 10 is the runtime save interval, for a monotonic clock 3513 # 10 is the runtime save interval, for a monotonic clock
3075 # 60 allows for the watchdog to kill the server. 3514 # 60 allows for the watchdog to kill the server.
… …
3085 aio_utime $fh, undef, undef; 3524 aio_utime $fh, undef, undef;
3086 3525
3087 close $fh 3526 close $fh
3088 or return; 3527 or return;
3089 3528
3090 aio_rename "$runtime~", $runtime 3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3091 and return; 3530 and return;
3092 3531
3093 warn "runtime file written.\n"; 3532 warn "runtime file written.\n";
3094 3533
3095 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 };
3096} 3585}
3097 3586
3098sub emergency_save() { 3587sub emergency_save() {
3099 my $freeze_guard = cf::freeze_mainloop; 3588 my $freeze_guard = cf::freeze_mainloop;
3100 3589
3101 warn "enter emergency perl save\n"; 3590 warn "emergency_perl_save: enter\n";
3102 3591
3103 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
3104 # use a peculiar iteration method to avoid tripping on perl 3598 # use a peculiar iteration method to avoid tripping on perl
3105 # refcount bugs in for. also avoids problems with players 3599 # refcount bugs in for. also avoids problems with players
3106 # and maps saved/destroyed asynchronously. 3600 # and maps saved/destroyed asynchronously.
3107 warn "begin emergency player save\n"; 3601 warn "emergency_perl_save: begin player save\n";
3108 for my $login (keys %cf::PLAYER) { 3602 for my $login (keys %cf::PLAYER) {
3109 my $pl = $cf::PLAYER{$login} or next; 3603 my $pl = $cf::PLAYER{$login} or next;
3110 $pl->valid or next; 3604 $pl->valid or next;
3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3111 $pl->save; 3606 $pl->save;
3112 } 3607 }
3113 warn "end emergency player save\n"; 3608 warn "emergency_perl_save: end player save\n";
3114 3609
3115 warn "begin emergency map save\n"; 3610 warn "emergency_perl_save: begin map save\n";
3116 for my $path (keys %cf::MAP) { 3611 for my $path (keys %cf::MAP) {
3117 my $map = $cf::MAP{$path} or next; 3612 my $map = $cf::MAP{$path} or next;
3118 $map->valid or next; 3613 $map->valid or next;
3119 $map->save; 3614 $map->save;
3120 } 3615 }
3121 warn "end emergency map save\n"; 3616 warn "emergency_perl_save: end map save\n";
3122 3617
3123 warn "begin emergency database checkpoint\n"; 3618 warn "emergency_perl_save: begin database checkpoint\n";
3124 BDB::db_env_txn_checkpoint $DB_ENV; 3619 BDB::db_env_txn_checkpoint $DB_ENV;
3125 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";
3126 }; 3625 };
3127 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
3128 warn "leave emergency perl save\n"; 3632 warn "emergency_perl_save: leave\n";
3129} 3633}
3130 3634
3131sub post_cleanup { 3635sub post_cleanup {
3132 my ($make_core) = @_; 3636 my ($make_core) = @_;
3133 3637
3134 warn Carp::longmess "post_cleanup backtrace" 3638 warn Carp::longmess "post_cleanup backtrace"
3135 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#
3136} 3669}
3137 3670
3138sub do_reload_perl() { 3671sub do_reload_perl() {
3139 # can/must only be called in main 3672 # can/must only be called in main
3140 if ($Coro::current != $Coro::main) { 3673 if ($Coro::current != $Coro::main) {
3141 warn "can only reload from main coroutine"; 3674 warn "can only reload from main coroutine";
3142 return; 3675 return;
3143 } 3676 }
3144 3677
3678 return if $RELOAD++;
3679
3680 my $t1 = EV::time;
3681
3682 while ($RELOAD) {
3145 warn "reloading..."; 3683 warn "reloading...";
3146 3684
3147 warn "entering sync_job"; 3685 warn "entering sync_job";
3148 3686
3149 cf::sync_job { 3687 cf::sync_job {
3150 cf::write_runtime; # external watchdog should not bark 3688 cf::write_runtime_sync; # external watchdog should not bark
3151 cf::emergency_save; 3689 cf::emergency_save;
3152 cf::write_runtime; # external watchdog should not bark 3690 cf::write_runtime_sync; # external watchdog should not bark
3153 3691
3154 warn "syncing database to disk"; 3692 warn "syncing database to disk";
3155 BDB::db_env_txn_checkpoint $DB_ENV; 3693 BDB::db_env_txn_checkpoint $DB_ENV;
3156 3694
3157 # 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
3158 3696
3159 warn "cancelling all WF_AUTOCANCEL watchers";
3160 for (Event::all_watchers) {
3161 $_->cancel if $_->data & WF_AUTOCANCEL;
3162 }
3163
3164 warn "flushing outstanding aio requests"; 3697 warn "flushing outstanding aio requests";
3165 for (;;) {
3166 BDB::flush;
3167 IO::AIO::flush;
3168 Coro::cede;
3169 last unless IO::AIO::nreqs || BDB::nreqs; 3698 while (IO::AIO::nreqs || BDB::nreqs) {
3170 warn "iterate..."; 3699 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3171 }
3172
3173 ++$RELOAD;
3174
3175 warn "cancelling all extension coros";
3176 $_->cancel for values %EXT_CORO;
3177 %EXT_CORO = ();
3178
3179 warn "removing commands";
3180 %COMMAND = ();
3181
3182 warn "removing ext/exti commands";
3183 %EXTCMD = ();
3184 %EXTICMD = ();
3185
3186 warn "unloading/nuking all extensions";
3187 for my $pkg (@EXTS) {
3188 warn "... unloading $pkg";
3189
3190 if (my $cb = $pkg->can ("unload")) {
3191 eval {
3192 $cb->($pkg);
3193 1
3194 } or warn "$pkg unloaded, but with errors: $@";
3195 } 3700 }
3196 3701
3197 warn "... nuking $pkg"; 3702 warn "cancelling all extension coros";
3198 Symbol::delete_package $pkg; 3703 $_->cancel for values %EXT_CORO;
3199 } 3704 %EXT_CORO = ();
3200 3705
3201 warn "unloading all perl modules loaded from $LIBDIR"; 3706 warn "removing commands";
3202 while (my ($k, $v) = each %INC) { 3707 %COMMAND = ();
3203 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3204 3708
3709 warn "removing ext/exti commands";
3710 %EXTCMD = ();
3711 %EXTICMD = ();
3712
3713 warn "unloading/nuking all extensions";
3714 for my $pkg (@EXTS) {
3205 warn "... unloading $k"; 3715 warn "... unloading $pkg";
3206 delete $INC{$k};
3207 3716
3208 $k =~ s/\.pm$//;
3209 $k =~ s/\//::/g;
3210
3211 if (my $cb = $k->can ("unload_module")) { 3717 if (my $cb = $pkg->can ("unload")) {
3718 eval {
3212 $cb->(); 3719 $cb->($pkg);
3720 1
3721 } or warn "$pkg unloaded, but with errors: $@";
3722 }
3723
3724 warn "... clearing $pkg";
3725 clear_package $pkg;
3213 } 3726 }
3214 3727
3215 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;
3216 } 3743 }
3217 3744
3218 warn "getting rid of safe::, as good as possible"; 3745 warn "getting rid of safe::, as good as possible";
3219 Symbol::delete_package "safe::$_" 3746 clear_package "safe::$_"
3220 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);
3221 3748
3222 warn "unloading cf.pm \"a bit\""; 3749 warn "unloading cf.pm \"a bit\"";
3223 delete $INC{"cf.pm"}; 3750 delete $INC{"cf.pm"};
3224 delete $INC{"cf/pod.pm"}; 3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3225 3752
3226 # don't, removes xs symbols, too, 3753 # don't, removes xs symbols, too,
3227 # and global variables created in xs 3754 # and global variables created in xs
3228 #Symbol::delete_package __PACKAGE__; 3755 #clear_package __PACKAGE__;
3229 3756
3230 warn "unload completed, starting to reload now"; 3757 warn "unload completed, starting to reload now";
3231 3758
3232 warn "reloading cf.pm"; 3759 warn "reloading cf.pm";
3233 require cf; 3760 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3762
3236 warn "loading config and database again"; 3763 warn "loading config and database again";
3237 cf::cfg_load; 3764 cf::reload_config;
3238 3765
3239 warn "loading extensions"; 3766 warn "loading extensions";
3240 cf::load_extensions; 3767 cf::load_extensions;
3241 3768
3769 if ($REATTACH_ON_RELOAD) {
3242 warn "reattaching attachments to objects/players"; 3770 warn "reattaching attachments to objects/players";
3243 _global_reattach; # objects, sockets 3771 _global_reattach; # objects, sockets
3244 warn "reattaching attachments to maps"; 3772 warn "reattaching attachments to maps";
3245 reattach $_ for values %MAP; 3773 reattach $_ for values %MAP;
3246 warn "reattaching attachments to players"; 3774 warn "reattaching attachments to players";
3247 reattach $_ for values %PLAYER; 3775 reattach $_ for values %PLAYER;
3776 }
3248 3777
3778 warn "running post_init jobs";
3779 (pop @POST_INIT)->(1) while @POST_INIT;
3780
3249 warn "leaving sync_job"; 3781 warn "leaving sync_job";
3250 3782
3251 1 3783 1
3252 } or do { 3784 } or do {
3253 warn $@; 3785 warn $@;
3254 warn "error while reloading, exiting."; 3786 cf::cleanup "error while reloading, exiting.";
3255 exit 1;
3256 }; 3787 };
3257 3788
3258 warn "reloaded"; 3789 warn "reloaded";
3790 --$RELOAD;
3791 }
3792
3793 $t1 = EV::time - $t1;
3794 warn "reload completed in ${t1}s\n";
3259}; 3795};
3260 3796
3261our $RELOAD_WATCHER; # used only during reload 3797our $RELOAD_WATCHER; # used only during reload
3262 3798
3263sub reload_perl() { 3799sub reload_perl() {
3264 # doing reload synchronously and two reloads happen back-to-back, 3800 # doing reload synchronously and two reloads happen back-to-back,
3265 # coro crashes during coro_state_free->destroy here. 3801 # coro crashes during coro_state_free->destroy here.
3266 3802
3267 $RELOAD_WATCHER ||= Event->timer ( 3803 $RELOAD_WATCHER ||= cf::async {
3268 reentrant => 0, 3804 Coro::AIO::aio_wait cache_extensions;
3269 after => 0, 3805
3270 data => WF_AUTOCANCEL, 3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3271 cb => sub {
3272 do_reload_perl; 3807 do_reload_perl;
3273 undef $RELOAD_WATCHER; 3808 undef $RELOAD_WATCHER;
3274 }, 3809 };
3275 ); 3810 };
3276} 3811}
3277 3812
3278register_command "reload" => sub { 3813register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3814 my ($who, $arg) = @_;
3280 3815
3281 if ($who->flag (FLAG_WIZ)) { 3816 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3817 $who->message ("reloading server.");
3818 async {
3819 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3820 reload_perl;
3821 };
3284 } 3822 }
3285}; 3823};
3286 3824
3287unshift @INC, $LIBDIR; 3825unshift @INC, $LIBDIR;
3288 3826
… …
3290 3828
3291our @WAIT_FOR_TICK; 3829our @WAIT_FOR_TICK;
3292our @WAIT_FOR_TICK_BEGIN; 3830our @WAIT_FOR_TICK_BEGIN;
3293 3831
3294sub wait_for_tick { 3832sub wait_for_tick {
3295 return unless $TICK_WATCHER->is_active;
3296 return if $Coro::current == $Coro::main; 3833 return if tick_inhibit || $Coro::current == $Coro::main;
3297 3834
3298 my $signal = new Coro::Signal; 3835 my $signal = new Coro::Signal;
3299 push @WAIT_FOR_TICK, $signal; 3836 push @WAIT_FOR_TICK, $signal;
3300 $signal->wait; 3837 $signal->wait;
3301} 3838}
3302 3839
3303sub wait_for_tick_begin { 3840sub wait_for_tick_begin {
3304 return unless $TICK_WATCHER->is_active;
3305 return if $Coro::current == $Coro::main; 3841 return if tick_inhibit || $Coro::current == $Coro::main;
3306 3842
3307 my $signal = new Coro::Signal; 3843 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3844 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3845 $signal->wait;
3310} 3846}
3311 3847
3312 my $min = 1e6;#d# 3848sub tick {
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer (
3315 reentrant => 0,
3316 parked => 1,
3317 prio => 0,
3318 at => $NEXT_TICK || $TICK,
3319 data => WF_AUTOCANCEL,
3320 cb => sub {
3321 if ($Coro::current != $Coro::main) { 3849 if ($Coro::current != $Coro::main) {
3322 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"
3323 unless ++$bug_warning > 10; 3851 unless ++$bug_warning > 10;
3324 return; 3852 return;
3325 } 3853 }
3326 3854
3327 $NOW = $tick_start = Event::time;
3328
3329 cf::server_tick; # one server iteration 3855 cf::server_tick; # one server iteration
3330 3856
3331 0 && sync_job {#d# 3857 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3332 for(1..10) { 3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3333 my $t = Event::time; 3859 Coro::async_pool {
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3860 $Coro::current->{desc} = "runtime saver";
3335 or die; 3861 write_runtime_sync
3336 3862 or warn "ERROR: unable to write runtime file: $!";
3337 $map->width (50);
3338 $map->height (50);
3339 $map->alloc;
3340 $map->_load_objects ("/tmp/x.map", 1);
3341 my $t = Event::time - $t;
3342
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 }; 3863 };
3864 }
3353 3865
3354 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK;
3356
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool {
3360 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!";
3362 };
3363 }
3364
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3866 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3867 $sig->send;
3370 } 3868 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3869 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3870 $sig->send;
3373 } 3871 }
3374 3872
3375 $NOW = Event::time; 3873 $LOAD = ($NOW - $TICK_START) / $TICK;
3376
3377 # if we are delayed by four ticks or more, skip them all
3378 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3379
3380 $TICK_WATCHER->at ($NEXT_TICK);
3381 $TICK_WATCHER->start;
3382
3383 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3874 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3875
3386 _post_tick; 3876 if (0) {
3387 3877 if ($NEXT_TICK) {
3388 3878 my $jitter = $TICK_START - $NEXT_TICK;
3879 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3880 warn "jitter $JITTER\n";#d#
3881 }
3389 }, 3882 }
3390); 3883}
3391 3884
3392{ 3885{
3393 BDB::max_poll_time $TICK * 0.1; 3886 # configure BDB
3394 $BDB_POLL_WATCHER = Event->io ( 3887
3395 reentrant => 0,
3396 fd => BDB::poll_fileno,
3397 poll => 'r',
3398 prio => 0,
3399 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb,
3401 );
3402 BDB::min_parallel 8; 3888 BDB::min_parallel 8;
3403 3889 BDB::max_poll_reqs $TICK * 0.1;
3404 BDB::set_sync_prepare { 3890 $AnyEvent::BDB::WATCHER->priority (1);
3405 my $status;
3406 my $current = $Coro::current;
3407 (
3408 sub {
3409 $status = $!;
3410 $current->ready; undef $current;
3411 },
3412 sub {
3413 Coro::schedule while defined $current;
3414 $! = $status;
3415 },
3416 )
3417 };
3418 3891
3419 unless ($DB_ENV) { 3892 unless ($DB_ENV) {
3420 $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);
3421 3899
3422 cf::sync_job { 3900 cf::sync_job {
3423 eval { 3901 eval {
3424 BDB::db_env_open 3902 BDB::db_env_open
3425 $DB_ENV, 3903 $DB_ENV,
… …
3427 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
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3906 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3907 0666;
3430 3908
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3909 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3910 };
3436 3911
3437 cf::cleanup "db_env_open(db): $@" if $@; 3912 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3913 };
3439 } 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 };
3440} 3925}
3441 3926
3442{ 3927{
3928 # configure IO::AIO
3929
3443 IO::AIO::min_parallel 8; 3930 IO::AIO::min_parallel 8;
3444
3445 undef $Coro::AIO::WATCHER;
3446 IO::AIO::max_poll_time $TICK * 0.1; 3931 IO::AIO::max_poll_time $TICK * 0.1;
3447 $AIO_POLL_WATCHER = Event->io ( 3932 undef $AnyEvent::AIO::WATCHER;
3448 reentrant => 0,
3449 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno,
3451 poll => 'r',
3452 prio => 6,
3453 cb => \&IO::AIO::poll_cb,
3454 );
3455} 3933}
3456 3934
3457my $_log_backtrace; 3935my $_log_backtrace;
3458 3936
3459sub _log_backtrace { 3937sub _log_backtrace {
… …
3462 $msg =~ s/\n//; 3940 $msg =~ s/\n//;
3463 3941
3464 # limit the # of concurrent backtraces 3942 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 3943 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 3944 ++$_log_backtrace;
3945 my $perl_bt = Carp::longmess $msg;
3467 async { 3946 async {
3947 $Coro::current->{desc} = "abt $msg";
3948
3468 my @bt = fork_call { 3949 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 3950 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3951 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 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 |"
3472 or die "addr2line: $!"; 3953 or die "addr2line: $!";
… …
3480 } 3961 }
3481 3962
3482 @funcs 3963 @funcs
3483 }; 3964 };
3484 3965
3485 LOG llevInfo, "[ABT] $msg\n"; 3966 LOG llevInfo, "[ABT] $perl_bt\n";
3967 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3486 LOG llevInfo, "[ABT] $_\n" for @bt; 3968 LOG llevInfo, "[ABT] $_\n" for @bt;
3487 --$_log_backtrace; 3969 --$_log_backtrace;
3488 }; 3970 };
3489 } else { 3971 } else {
3490 LOG llevInfo, "[ABT] $msg\n"; 3972 LOG llevInfo, "[ABT] $msg\n";
3491 LOG llevInfo, "[ABT] [suppressed]\n"; 3973 LOG llevInfo, "[ABT] [suppressed]\n";
3492 } 3974 }
3493} 3975}
3494 3976
3495# load additional modules 3977# load additional modules
3496use cf::pod; 3978require "cf/$_.pm" for @EXTRA_MODULES;
3497 3979
3498END { cf::emergency_save } 3980END { cf::emergency_save }
3499 3981
35001 39821
3501 3983

Diff Legend

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