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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines