ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.214 by root, Wed Feb 14 00:40:05 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Socket;
9use EV 1.86;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
13use Storable ();
12 14
13use Coro 3.5 (); 15use Coro 4.32 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::EV;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
24use Coro::Storable;
25use Coro::Util ();
19 26
27use JSON::XS 2.01 ();
20use BDB (); 28use BDB ();
21use Data::Dumper; 29use Data::Dumper;
22use Digest::MD5; 30use Digest::MD5;
23use Fcntl; 31use Fcntl;
32use YAML ();
24use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
25use YAML::Syck ();
26use Time::HiRes; 34use Time::HiRes;
27use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
28 37
38# configure various modules to our taste
39#
40$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 43
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 45
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1;
37
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
39 47
40our %COMMAND = (); 48our %COMMAND = ();
41our %COMMAND_TIME = (); 49our %COMMAND_TIME = ();
42 50
43our @EXTS = (); # list of extension package names 51our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 52our %EXTCMD = ();
53our %EXTICMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
47 56
57our $RELOAD; # number of reloads so far
48our @EVENT; 58our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 59
51our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
72
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52our $TICK_WATCHER; 74our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 77our $NEXT_TICK;
56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
58 79
59our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
60our $DB_ENV; 84our $DB_ENV;
61 85
62our %CFG; 86our %CFG;
63 87
64our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
65our $RUNTIME; 89our $RUNTIME;
90our $NOW;
66 91
67our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
68our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
69our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 95
76# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
79binmode STDOUT; 103binmode STDOUT;
80binmode STDERR; 104binmode STDERR;
81 105
82# read virtual server time, if available 106# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
87} 111}
88 112
89mkdir cf::localdir; 113mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 115
96our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
97 117
98sub cf::map::normalise; 118sub cf::map::normalise;
99 119
… …
110=item $cf::RUNTIME 130=item $cf::RUNTIME
111 131
112The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
113every server tick. 133every server tick.
114 134
115=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116 138
117The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
118be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
119 143
120=item $cf::NOW 144=item $cf::NOW
121 145
122The time of the last (current) server tick. 146The time of the last (current) server tick.
123 147
124=item $cf::TICK 148=item $cf::TICK
125 149
126The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
127 151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
161
128=item %cf::CFG 162=item %cf::CFG
129 163
130Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
131from wherever your confdir points to. 165from wherever your confdir points to.
132 166
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
134 168
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This 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
177that call.
139 178
140=back 179=back
141 180
142=cut 181=cut
143 182
144BEGIN { 183BEGIN {
145 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 185 my $msg = join "", @_;
147 utf8::encode $msg;
148 186
149 $msg .= "\n" 187 $msg .= "\n"
150 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
151 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
152 LOG llevError, $msg; 192 LOG llevError, $msg;
153 }; 193 };
154} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
155 210
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 215@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
216@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
161@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 217@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
162 218
163# we bless all objects into (empty) derived classes to force a method lookup 219# we bless all objects into (empty) derived classes to force a method lookup
164# within the Safe compartment. 220# within the Safe compartment.
165for my $pkg (qw( 221for my $pkg (qw(
166 cf::global cf::attachable 222 cf::global cf::attachable
… …
171)) { 227)) {
172 no strict 'refs'; 228 no strict 'refs';
173 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
174} 230}
175 231
176$Event::DIED = sub { 232$EV::DIED = sub {
177 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
178}; 234};
235
236#############################################################################
179 237
180=head2 UTILITY FUNCTIONS 238=head2 UTILITY FUNCTIONS
181 239
182=over 4 240=over 4
183 241
… …
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 261 $d
204 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
205} 263}
206 264
207use JSON::Syck (); # TODO# replace by JSON::PC once working
208
209=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
210 266
211Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
212 268
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
221 270
222Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
223 272
224=cut 273=cut
225 274
226sub to_json($) { 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 276
228 JSON::Syck::Dump $_[0] 277sub encode_json($) { $json_coder->encode ($_[0]) }
229} 278sub decode_json($) { $json_coder->decode ($_[0]) }
230 279
231=item cf::lock_wait $string 280=item cf::lock_wait $string
232 281
233Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
234 283
… …
237Wait until the given lock is available and then acquires it and returns 286Wait until the given lock is available and then acquires it and returns
238a Coro::guard object. If the guard object gets destroyed (goes out of scope, 287a Coro::guard object. If the guard object gets destroyed (goes out of scope,
239for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
240returned. 289returned.
241 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
242Lock names should begin with a unique identifier (for example, cf::map::find 294Lock names should begin with a unique identifier (for example, cf::map::find
243uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
244 296
297=item $locked = cf::lock_active $string
298
299Return true if the lock is currently active, i.e. somebody has locked it.
300
245=cut 301=cut
246 302
247our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
248 305
249sub lock_wait($) { 306sub lock_wait($) {
250 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
251 313
252 # wait for lock, if any 314 # wait for lock, if any
253 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
254 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
255 Coro::schedule; 317 Coro::schedule;
… …
261 323
262 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
263 lock_wait $key; 325 lock_wait $key;
264 326
265 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
266 329
267 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
268 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
270 } 334 }
335}
336
337sub lock_active($) {
338 my ($key) = @_;
339
340 ! ! $LOCK{$key}
271} 341}
272 342
273sub freeze_mainloop { 343sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 344 return unless $TICK_WATCHER->is_active;
275 345
… …
278 }; 348 };
279 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
280 $guard 350 $guard
281} 351}
282 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
368=item cf::get_slot $time[, $priority[, $name]]
369
370Allocate $time seconds of blocking CPU time at priority C<$priority>:
371This call blocks and returns only when you have at least C<$time> seconds
372of cpu time till the next tick. The slot is only valid till the next cede.
373
374The optional C<$name> can be used to identify the job to run. It might be
375used for statistical purposes and should identify the same time-class.
376
377Useful for short background jobs.
378
379=cut
380
381our @SLOT_QUEUE;
382our $SLOT_QUEUE;
383
384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
388 my $signal = new Coro::Signal;
389
390 while () {
391 next_job:
392 my $avail = cf::till_tick;
393 if ($avail > 0.01) {
394 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) {
396 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send;
398 Coro::cede;
399 goto next_job;
400 }
401 }
402 }
403
404 if (@SLOT_QUEUE) {
405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
406 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait;
408 } else {
409 Coro::schedule;
410 }
411 }
412};
413
414sub get_slot($;$$) {
415 my ($time, $pri, $name) = @_;
416
417 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal;
419
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready;
423 $sig->wait;
424}
425
283=item cf::async { BLOCK } 426=item cf::async { BLOCK }
284 427
285Currently the same as Coro::async_pool, meaning you cannot use 428Currently the same as Coro::async_pool, meaning you cannot use
286C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 429C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
287thing you are allowed to do is call C<prio> on it. 430thing you are allowed to do is call C<prio> on it.
… …
290 433
291BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
292 435
293=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
294 437
295The design of crossfire+ requires that the main coro ($Coro::main) is 438The design of Deliantra requires that the main coroutine ($Coro::main)
296always able to handle events or runnable, as crossfire+ is only partly 439is always able to handle events or runnable, as Deliantra is only
297reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
441acceptable.
298 442
299If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
300the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
301server will be frozen during this time, so the block should either finish 445server will be frozen during this time, so the block should either finish
302fast or be very important. 446fast or be very important.
… …
305 449
306sub sync_job(&) { 450sub sync_job(&) {
307 my ($job) = @_; 451 my ($job) = @_;
308 452
309 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
454 my $time = EV::time;
455
310 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
311 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
312 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
313 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
314 # (but this is cancel-safe) 462 # (but this is cancel-safe)
315 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
316 464
317 my $busy = 1; 465 my $busy = 1;
318 my @res; 466 my @res;
319 467
320 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
321 @res = eval { $job->() }; 470 @res = eval { $job->() };
322 warn $@ if $@; 471 warn $@ if $@;
323 undef $busy; 472 undef $busy;
324 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
325 474
326 while ($busy) { 475 while ($busy) {
327 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
328 } 480 }
481 }
482
483 $time = EV::time - $time;
484
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load
329 489
330 wantarray ? @res : $res[0] 490 wantarray ? @res : $res[0]
331 } else { 491 } else {
332 # we are in another coroutine, how wonderful, everything just works 492 # we are in another coroutine, how wonderful, everything just works
333 493
… …
353 $EXT_CORO{$coro+0} = $coro; 513 $EXT_CORO{$coro+0} = $coro;
354 514
355 $coro 515 $coro
356} 516}
357 517
358sub write_runtime { 518=item fork_call { }, $args
359 my $runtime = cf::localdir . "/runtime";
360 519
361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 520Executes the given code block with the given arguments in a seperate
362 or return; 521process, returning the results. Everything must be serialisable with
522Coro::Storable. May, of course, block. Note that the executed sub may
523never block itself or use any form of event handling.
363 524
364 my $value = $cf::RUNTIME + 90 + 10; 525=cut
365 # 10 is the runtime save interval, for a monotonic clock
366 # 60 allows for the watchdog to kill the server.
367 526
368 (aio_write $fh, 0, (length $value), $value, 0) <= 0 527sub fork_call(&@) {
369 and return; 528 my ($cb, @args) = @_;
370 529
371 # always fsync - this file is important 530 # we seemingly have to make a local copy of the whole thing,
372 aio_fsync $fh 531 # otherwise perl prematurely frees the stuff :/
373 and return; 532 # TODO: investigate and fix (likely this will be rather laborious)
374 533
375 close $fh 534 my @res = Coro::Util::fork_eval {
376 or return; 535 reset_signals;
536 &$cb
537 }, @args;
377 538
378 aio_rename "$runtime~", $runtime 539 wantarray ? @res : $res[-1]
379 and return; 540}
380 541
542=item $value = cf::db_get $family => $key
543
544Returns a single value from the environment database.
545
546=item cf::db_put $family => $key => $value
547
548Stores the given C<$value> in the family. It can currently store binary
549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
574
575our $DB;
576
577sub db_init {
578 cf::sync_job {
579 $DB ||= db_table "db";
580 };
581}
582
583sub db_get($$) {
584 my $key = "$_[0]/$_[1]";
585
586 cf::sync_job {
587 BDB::db_get $DB, undef, $key, my $data;
588
589 $! ? ()
590 : $data
381 1 591 }
592}
593
594sub db_put($$$) {
595 BDB::dbreq_pri 4;
596 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
597}
598
599=item cf::cache $id => [$paths...], $processversion => $process
600
601Generic caching function that returns the value of the resource $id,
602caching and regenerating as required.
603
604This function can block.
605
606=cut
607
608sub cache {
609 my ($id, $src, $processversion, $process) = @_;
610
611 my $meta =
612 join "\x00",
613 $processversion,
614 map {
615 aio_stat $_
616 and Carp::croak "$_: $!";
617
618 ($_, (stat _)[7,9])
619 } @$src;
620
621 my $dbmeta = db_get cache => "$id/meta";
622 if ($dbmeta ne $meta) {
623 # changed, we may need to process
624
625 my @data;
626 my $md5;
627
628 for (0 .. $#$src) {
629 0 <= aio_load $src->[$_], $data[$_]
630 or Carp::croak "$src->[$_]: $!";
631 }
632
633 # if processing is expensive, check
634 # checksum first
635 if (1) {
636 $md5 =
637 join "\x00",
638 $processversion,
639 map {
640 cf::cede_to_tick;
641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
642 } 0.. $#$src;
643
644
645 my $dbmd5 = db_get cache => "$id/md5";
646 if ($dbmd5 eq $md5) {
647 db_put cache => "$id/meta", $meta;
648
649 return db_get cache => "$id/data";
650 }
651 }
652
653 my $t1 = Time::HiRes::time;
654 my $data = $process->(\@data);
655 my $t2 = Time::HiRes::time;
656
657 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
658
659 db_put cache => "$id/data", $data;
660 db_put cache => "$id/md5" , $md5;
661 db_put cache => "$id/meta", $meta;
662
663 return $data;
664 }
665
666 db_get cache => "$id/data"
667}
668
669=item cf::datalog type => key => value, ...
670
671Log a datalog packet of the given type with the given key-value pairs.
672
673=cut
674
675sub datalog($@) {
676 my ($type, %kv) = @_;
677 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
382} 678}
383 679
384=back 680=back
385 681
386=cut 682=cut
… …
393attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
394to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
395 691
396In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
397C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
398crossfire+). 694Deliantra).
399 695
400=over 4 696=over 4
401 697
402=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
403 699
… …
566 $registry = $CB_TYPE[$object_type] ||= []; 862 $registry = $CB_TYPE[$object_type] ||= [];
567 863
568 } elsif ($type eq "subtype") { 864 } elsif ($type eq "subtype") {
569 defined $object_type or Carp::croak "subtype specified without type"; 865 defined $object_type or Carp::croak "subtype specified without type";
570 my $object_subtype = shift @arg; 866 my $object_subtype = shift @arg;
571 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 867 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
572 868
573 } elsif ($type eq "package") { 869 } elsif ($type eq "package") {
574 my $pkg = shift @arg; 870 my $pkg = shift @arg;
575 871
576 while (my ($name, $id) = each %cb_id) { 872 while (my ($name, $id) = each %cb_id) {
… …
605 _attach $registry, $klass, @attach; 901 _attach $registry, $klass, @attach;
606 } 902 }
607 903
608 $obj->{$name} = \%arg; 904 $obj->{$name} = \%arg;
609 } else { 905 } else {
610 warn "object uses attachment '$name' that is not available, postponing.\n"; 906 warn "object uses attachment '$name' which is not available, postponing.\n";
611 } 907 }
612 908
613 $obj->{_attachment}{$name} = undef; 909 $obj->{_attachment}{$name} = undef;
614} 910}
615 911
… …
617 if (ref $_[0]) { 913 if (ref $_[0]) {
618 _object_attach @_; 914 _object_attach @_;
619 } else { 915 } else {
620 _attach shift->_attach_registry, @_; 916 _attach shift->_attach_registry, @_;
621 } 917 }
918 _recalc_want;
622}; 919};
623 920
624# all those should be optimised 921# all those should be optimised
625sub cf::attachable::detach { 922sub cf::attachable::detach {
626 my ($obj, $name) = @_; 923 my ($obj, $name) = @_;
… …
629 delete $obj->{_attachment}{$name}; 926 delete $obj->{_attachment}{$name};
630 reattach ($obj); 927 reattach ($obj);
631 } else { 928 } else {
632 Carp::croak "cannot, currently, detach class attachments"; 929 Carp::croak "cannot, currently, detach class attachments";
633 } 930 }
931 _recalc_want;
634}; 932};
635 933
636sub cf::attachable::attached { 934sub cf::attachable::attached {
637 my ($obj, $name) = @_; 935 my ($obj, $name) = @_;
638 936
… …
653 "; 951 ";
654 die if $@; 952 die if $@;
655} 953}
656 954
657our $override; 955our $override;
658our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 956our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
659 957
660sub override { 958sub override {
661 $override = 1; 959 $override = 1;
662 @invoke_results = (); 960 @INVOKE_RESULTS = (@_);
663} 961}
664 962
665sub do_invoke { 963sub do_invoke {
666 my $event = shift; 964 my $event = shift;
667 my $callbacks = shift; 965 my $callbacks = shift;
668 966
669 @invoke_results = (); 967 @INVOKE_RESULTS = ();
670 968
671 local $override; 969 local $override;
672 970
673 for (@$callbacks) { 971 for (@$callbacks) {
674 eval { &{$_->[1]} }; 972 eval { &{$_->[1]} };
… …
683 } 981 }
684 982
685 0 983 0
686} 984}
687 985
688=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
689 987
690=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
691 989
692Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
693 991
694This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 992This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
695removed in future versions), and there is no public API to access override 993removed in future versions), and there is no public API to access override
696results (if you must, access C<@cf::invoke_results> directly). 994results (if you must, access C<@cf::INVOKE_RESULTS> directly).
697 995
698=back 996=back
699 997
700=cut 998=cut
701 999
702############################################################################# 1000#############################################################################
703# object support 1001# object support
1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
1036sub _can_merge {
1037 my ($ob1, $ob2) = @_;
1038
1039 ++$SLOW_MERGES;#d#
1040
1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
1043}
704 1044
705sub reattach { 1045sub reattach {
706 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
707 my ($obj) = @_; 1047 my ($obj) = @_;
708 1048
… …
729cf::attachable->attach ( 1069cf::attachable->attach (
730 prio => -1000000, 1070 prio => -1000000,
731 on_instantiate => sub { 1071 on_instantiate => sub {
732 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
733 1073
734 $data = from_json $data; 1074 $data = decode_json $data;
735 1075
736 for (@$data) { 1076 for (@$data) {
737 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
738 1078
739 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
755sub object_freezer_save { 1095sub object_freezer_save {
756 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
757 1097
758 sync_job { 1098 sync_job {
759 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
760 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
761 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
762 1103
763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
764 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
765 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
766 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
767 close $fh; 1108 close $fh;
768 1109
769 if (@$objs) { 1110 if (@$objs) {
770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
771 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
772 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
773 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
774 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
775 close $fh; 1116 close $fh;
776 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
777 } 1118 }
… …
785 } 1126 }
786 } else { 1127 } else {
787 aio_unlink $filename; 1128 aio_unlink $filename;
788 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
789 } 1130 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
796 } 1131 };
797} 1132}
798 1133
799sub object_freezer_as_string { 1134sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
801 1136
… …
806 1141
807sub object_thawer_load { 1142sub object_thawer_load {
808 my ($filename) = @_; 1143 my ($filename) = @_;
809 1144
810 my ($data, $av); 1145 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
814 1146
815 (aio_load $filename, $data) >= 0 1147 (aio_load $filename, $data) >= 0
816 or return; 1148 or return;
817 1149
818 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
819 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
820 or return; 1152 or return;
1153
821 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
822 } 1156 }
823 1157
1158 utf8::decode (my $decname = $filename);
824 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
825 $filename, length $data, scalar @{$av || []};#d# 1160 $decname, length $data, scalar @{$av || []};
1161
826 return ($data, $av); 1162 ($data, $av)
827} 1163}
1164
1165=head2 COMMAND CALLBACKS
1166
1167=over 4
1168
1169=cut
828 1170
829############################################################################# 1171#############################################################################
830# command handling &c 1172# command handling &c
831 1173
832=item cf::register_command $name => \&callback($ob,$args); 1174=item cf::register_command $name => \&callback($ob,$args);
… …
845 push @{ $COMMAND{$name} }, [$caller, $cb]; 1187 push @{ $COMMAND{$name} }, [$caller, $cb];
846} 1188}
847 1189
848=item cf::register_extcmd $name => \&callback($pl,$packet); 1190=item cf::register_extcmd $name => \&callback($pl,$packet);
849 1191
850Register a callbackf ro execution when the client sends an extcmd packet. 1192Register a callback for execution when the client sends an (synchronous)
1193extcmd packet. Ext commands will be processed in the order they are
1194received by the server, like other user commands. The first argument is
1195the logged-in player. Ext commands can only be processed after a player
1196has logged in successfully.
851 1197
852If the callback returns something, it is sent back as if reply was being 1198If the callback returns something, it is sent back as if reply was being
853called. 1199called.
854 1200
1201=item cf::register_exticmd $name => \&callback($ns,$packet);
1202
1203Register a callback for execution when the client sends an (asynchronous)
1204exticmd packet. Exti commands are processed by the server as soon as they
1205are received, i.e. out of order w.r.t. other commands. The first argument
1206is a client socket. Exti commands can be received anytime, even before
1207log-in.
1208
1209If the callback returns something, it is sent back as if reply was being
1210called.
1211
855=cut 1212=cut
856 1213
857sub register_extcmd { 1214sub register_extcmd {
858 my ($name, $cb) = @_; 1215 my ($name, $cb) = @_;
859 1216
860 $EXTCMD{$name} = $cb; 1217 $EXTCMD{$name} = $cb;
1218}
1219
1220sub register_exticmd {
1221 my ($name, $cb) = @_;
1222
1223 $EXTICMD{$name} = $cb;
861} 1224}
862 1225
863cf::player->attach ( 1226cf::player->attach (
864 on_command => sub { 1227 on_command => sub {
865 my ($pl, $name, $params) = @_; 1228 my ($pl, $name, $params) = @_;
… …
874 cf::override; 1237 cf::override;
875 }, 1238 },
876 on_extcmd => sub { 1239 on_extcmd => sub {
877 my ($pl, $buf) = @_; 1240 my ($pl, $buf) = @_;
878 1241
879 my $msg = eval { from_json $buf }; 1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
880 1243
881 if (ref $msg) { 1244 if (ref $msg) {
1245 my ($type, $reply, @payload) =
1246 "ARRAY" eq ref $msg
1247 ? @$msg
1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1249
1250 my @reply;
1251
882 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1252 if (my $cb = $EXTCMD{$type}) {
883 if (my %reply = $cb->($pl, $msg)) { 1253 @reply = $cb->($pl, @payload);
884 $pl->ext_reply ($msg->{msgid}, %reply);
885 }
886 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
887 } else { 1259 } else {
888 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
889 } 1261 }
890 1262
891 cf::override; 1263 cf::override;
892 }, 1264 },
893); 1265);
894 1266
895sub load_extension {
896 my ($path) = @_;
897
898 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
899 my $base = $1;
900 my $pkg = $1;
901 $pkg =~ s/[^[:word:]]/_/g;
902 $pkg = "ext::$pkg";
903
904 warn "... loading '$path' into '$pkg'\n";
905
906 open my $fh, "<:utf8", $path
907 or die "$path: $!";
908
909 my $source =
910 "package $pkg; use strict; use utf8;\n"
911 . "#line 1 \"$path\"\n{\n"
912 . (do { local $/; <$fh> })
913 . "\n};\n1";
914
915 unless (eval $source) {
916 my $msg = $@ ? "$path: $@\n"
917 : "extension disabled.\n";
918 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
919 warn $@;
920 warn "mandatory extension failed to load, exiting.\n";
921 exit 1;
922 }
923 die $@;
924 }
925
926 push @EXTS, $pkg;
927}
928
929sub load_extensions { 1267sub load_extensions {
1268 cf::sync_job {
1269 my %todo;
1270
930 for my $ext (<$LIBDIR/*.ext>) { 1271 for my $path (<$LIBDIR/*.ext>) {
931 next unless -r $ext; 1272 next unless -r $path;
932 eval { 1273
933 load_extension $ext; 1274 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1275 my $base = $1;
1276 my $pkg = $1;
1277 $pkg =~ s/[^[:word:]]/_/g;
1278 $pkg = "ext::$pkg";
1279
1280 open my $fh, "<:utf8", $path
1281 or die "$path: $!";
1282
1283 my $source = do { local $/; <$fh> };
1284
1285 my %ext = (
1286 path => $path,
1287 base => $base,
1288 pkg => $pkg,
1289 );
1290
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293
1294 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n"
1297 . $source
1298 . "\n};\n1";
1299
1300 $todo{$base} = \%ext;
1301 }
1302
1303 my %done;
1304 while (%todo) {
1305 my $progress;
1306
1307 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip
1310 unless exists $done{$_};
1311 }
1312
1313 warn "... loading '$k' into '$v->{pkg}'\n";
1314
1315 unless (eval $v->{source}) {
1316 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n";
1318
1319 if (exists $v->{meta}{mandatory}) {
1320 warn $msg;
1321 cf::cleanup "mandatory extension failed to load, exiting.";
1322 }
1323
1324 warn $msg;
1325 }
1326
1327 $done{$k} = delete $todo{$k};
1328 push @EXTS, $v->{pkg};
1329 $progress = 1;
934 1 1330 }
935 } or warn "$ext not loaded: $@"; 1331
1332 skip:
1333 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1334 unless $progress;
1335 }
936 } 1336 };
937} 1337}
938 1338
939############################################################################# 1339#############################################################################
940 1340
1341=back
1342
941=head2 CORE EXTENSIONS 1343=head2 CORE EXTENSIONS
942 1344
943Functions and methods that extend core crossfire objects. 1345Functions and methods that extend core crossfire objects.
944 1346
945=cut 1347=cut
… …
950 1352
951=head3 cf::player 1353=head3 cf::player
952 1354
953=over 4 1355=over 4
954 1356
1357=item cf::player::num_playing
1358
1359Returns the official number of playing players, as per the Crossfire metaserver rules.
1360
1361=cut
1362
1363sub num_playing {
1364 scalar grep
1365 $_->ob->map
1366 && !$_->hidden
1367 && !$_->ob->flag (cf::FLAG_WIZ),
1368 cf::player::list
1369}
1370
955=item cf::player::find $login 1371=item cf::player::find $login
956 1372
957Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
958 1374
959=cut 1375=cut
960 1376
961sub playerdir($) { 1377sub playerdir($) {
962 cf::localdir 1378 "$PLAYERDIR/"
963 . "/"
964 . cf::playerdir
965 . "/"
966 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1379 . (ref $_[0] ? $_[0]->ob->name : $_[0])
967} 1380}
968 1381
969sub path($) { 1382sub path($) {
970 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1383 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
971 1384
972 (playerdir $login) . "/$login.pl" 1385 (playerdir $login) . "/playerdata"
973} 1386}
974 1387
975sub find_active($) { 1388sub find_active($) {
976 $cf::PLAYER{$_[0]} 1389 $cf::PLAYER{$_[0]}
977 and $cf::PLAYER{$_[0]}->active 1390 and $cf::PLAYER{$_[0]}->active
… …
990 my $login = $_[0]; 1403 my $login = $_[0];
991 1404
992 my $guard = cf::lock_acquire "user_find:$login"; 1405 my $guard = cf::lock_acquire "user_find:$login";
993 1406
994 $cf::PLAYER{$_[0]} || do { 1407 $cf::PLAYER{$_[0]} || do {
995 my $pl = load_pl path $login 1408 # rename old playerfiles to new ones
1409 #TODO: remove when no longer required
1410 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1411 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1412 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1413 aio_unlink +(playerdir $login) . "/$login.pl";
1414
1415 my $f = new_from_file cf::object::thawer path $login
996 or return; 1416 or return;
1417
1418 my $pl = cf::player::load_pl $f
1419 or return;
1420 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs;
997 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
998 } 1423 }
999 } 1424 }
1000} 1425}
1001 1426
… …
1011 1436
1012 aio_mkdir playerdir $pl, 0770; 1437 aio_mkdir playerdir $pl, 0770;
1013 $pl->{last_save} = $cf::RUNTIME; 1438 $pl->{last_save} = $cf::RUNTIME;
1014 1439
1015 $pl->save_pl ($path); 1440 $pl->save_pl ($path);
1016 Coro::cede; 1441 cf::cede_to_tick;
1017} 1442}
1018 1443
1019sub new($) { 1444sub new($) {
1020 my ($login) = @_; 1445 my ($login) = @_;
1021 1446
… …
1027 $cf::PLAYER{$login} = $self; 1452 $cf::PLAYER{$login} = $self;
1028 1453
1029 $self 1454 $self
1030} 1455}
1031 1456
1457=item $player->send_msg ($channel, $msg, $color, [extra...])
1458
1459=cut
1460
1461sub send_msg {
1462 my $ns = shift->ns
1463 or return;
1464 $ns->send_msg (@_);
1465}
1466
1032=item $pl->quit_character 1467=item $pl->quit_character
1033 1468
1034Nukes the player without looking back. If logged in, the connection will 1469Nukes the player without looking back. If logged in, the connection will
1035be destroyed. May block for a long time. 1470be destroyed. May block for a long time.
1036 1471
1037=cut 1472=cut
1038 1473
1039sub quit_character { 1474sub quit_character {
1040 my ($pl) = @_; 1475 my ($pl) = @_;
1476
1477 my $name = $pl->ob->name;
1041 1478
1042 $pl->{deny_save} = 1; 1479 $pl->{deny_save} = 1;
1043 $pl->password ("*"); # this should lock out the player until we nuked the dir 1480 $pl->password ("*"); # this should lock out the player until we nuked the dir
1044 1481
1045 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1050 my $path = playerdir $pl; 1487 my $path = playerdir $pl;
1051 my $temp = "$path~$cf::RUNTIME~deleting~"; 1488 my $temp = "$path~$cf::RUNTIME~deleting~";
1052 aio_rename $path, $temp; 1489 aio_rename $path, $temp;
1053 delete $cf::PLAYER{$pl->ob->name}; 1490 delete $cf::PLAYER{$pl->ob->name};
1054 $pl->destroy; 1491 $pl->destroy;
1492
1493 my $prefix = qr<^~\Q$name\E/>;
1494
1495 # nuke player maps
1496 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1497
1055 IO::AIO::aio_rmtree $temp; 1498 IO::AIO::aio_rmtree $temp;
1499}
1500
1501=item $pl->kick
1502
1503Kicks a player out of the game. This destroys the connection.
1504
1505=cut
1506
1507sub kick {
1508 my ($pl, $kicker) = @_;
1509
1510 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1511 $pl->killer ("kicked");
1512 $pl->ns->destroy;
1056} 1513}
1057 1514
1058=item cf::player::list_logins 1515=item cf::player::list_logins
1059 1516
1060Returns am arrayref of all valid playernames in the system, can take a 1517Returns am arrayref of all valid playernames in the system, can take a
1061while and may block, so not sync_job-capable, ever. 1518while and may block, so not sync_job-capable, ever.
1062 1519
1063=cut 1520=cut
1064 1521
1065sub list_logins { 1522sub list_logins {
1066 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1523 my $dirs = aio_readdir $PLAYERDIR
1067 or return []; 1524 or return [];
1068 1525
1069 my @logins; 1526 my @logins;
1070 1527
1071 for my $login (@$dirs) { 1528 for my $login (@$dirs) {
1529 my $path = path $login;
1530
1531 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") {
1072 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1073 aio_read $fh, 0, 512, my $buf, 0 or next; 1534 aio_read $fh, 0, 512, my $buf, 0 or next;
1074 $buf !~ /^password -------------$/m or next; # official not-valid tag 1535 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 }
1075 1537
1076 utf8::decode $login; 1538 utf8::decode $login;
1077 push @logins, $login; 1539 push @logins, $login;
1078 } 1540 }
1079 1541
… …
1106 } 1568 }
1107 1569
1108 \@paths 1570 \@paths
1109} 1571}
1110 1572
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1574
1575Expand crossfire pod fragments into protocol xml.
1576
1577=cut
1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1590sub expand_cfpod {
1591 my ($self, $pod) = @_;
1592
1593 my $xml;
1594
1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1598
1599 $group =~ s/&/&amp;/g;
1600 $group =~ s/</&lt;/g;
1601
1602 $xml .= $group;
1603 } elsif ($pod =~ m%\G
1604 ([BCGHITU])
1605 <
1606 (?:
1607 ([^<>]*) (?{ $group = $^N })
1608 | < $interior >
1609 )
1610 >
1611 %gcsx
1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1632 "")
1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1644
1645 for ($xml) {
1646 # create single paragraphs (very hackish)
1647 s/(?<=\S)\n(?=\w)/ /g;
1648
1649 # compress some whitespace
1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1655
1656 $xml
1657}
1658
1659no re 'eval';
1660
1661sub hintmode {
1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1663 $_[0]{hintmode}
1664}
1665
1111=item $player->ext_reply ($msgid, $msgtype, %msg) 1666=item $player->ext_reply ($msgid, @msg)
1112 1667
1113Sends an ext reply to the player. 1668Sends an ext reply to the player.
1114 1669
1115=cut 1670=cut
1116 1671
1117sub ext_reply($$$%) { 1672sub ext_reply($$@) {
1118 my ($self, $id, %msg) = @_; 1673 my ($self, $id, @msg) = @_;
1119 1674
1120 $msg{msgid} = $id; 1675 $self->ns->ext_reply ($id, @msg)
1121
1122 $self->send ("ext " . cf::to_json \%msg);
1123} 1676}
1124 1677
1125package cf; 1678=item $player->ext_msg ($type, @msg)
1679
1680Sends an ext event to the client.
1681
1682=cut
1683
1684sub ext_msg($$@) {
1685 my ($self, $type, @msg) = @_;
1686
1687 $self->ns->ext_msg ($type, @msg);
1688}
1689
1690=head3 cf::region
1691
1692=over 4
1693
1694=cut
1695
1696package cf::region;
1697
1698=item cf::region::find_by_path $path
1699
1700Tries to decuce the likely region for a map knowing only its path.
1701
1702=cut
1703
1704sub find_by_path($) {
1705 my ($path) = @_;
1706
1707 my ($match, $specificity);
1708
1709 for my $region (list) {
1710 if ($region->{match} && $path =~ $region->{match}) {
1711 ($match, $specificity) = ($region, $region->specificity)
1712 if $region->specificity > $specificity;
1713 }
1714 }
1715
1716 $match
1717}
1126 1718
1127=back 1719=back
1128
1129 1720
1130=head3 cf::map 1721=head3 cf::map
1131 1722
1132=over 4 1723=over 4
1133 1724
… …
1188 my ($self, $merge) = @_; 1779 my ($self, $merge) = @_;
1189 1780
1190 # we have to keep some variables in memory intact 1781 # we have to keep some variables in memory intact
1191 local $self->{path}; 1782 local $self->{path};
1192 local $self->{load_path}; 1783 local $self->{load_path};
1193 local $self->{deny_save};
1194 local $self->{deny_reset};
1195 1784
1196 $self->SUPER::thawer_merge ($merge); 1785 $self->SUPER::thawer_merge ($merge);
1197} 1786}
1198 1787
1199sub normalise { 1788sub normalise {
… …
1246 $self->init; # pass $1 etc. 1835 $self->init; # pass $1 etc.
1247 return $self; 1836 return $self;
1248 } 1837 }
1249 } 1838 }
1250 1839
1251 Carp::carp "unable to resolve path '$path' (base '$base')."; 1840 Carp::cluck "unable to resolve path '$path' (base '$base').";
1252 () 1841 ()
1253} 1842}
1254 1843
1255sub init { 1844sub init {
1256 my ($self) = @_; 1845 my ($self) = @_;
… …
1271 1860
1272# the original (read-only) location 1861# the original (read-only) location
1273sub load_path { 1862sub load_path {
1274 my ($self) = @_; 1863 my ($self) = @_;
1275 1864
1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1865 "$MAPDIR/$self->{path}.map"
1277} 1866}
1278 1867
1279# the temporary/swap location 1868# the temporary/swap location
1280sub save_path { 1869sub save_path {
1281 my ($self) = @_; 1870 my ($self) = @_;
1282 1871
1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1873 "$TMPDIR/$path.map"
1285} 1874}
1286 1875
1287# the unique path, undef == no special unique path 1876# the unique path, undef == no special unique path
1288sub uniq_path { 1877sub uniq_path {
1289 my ($self) = @_; 1878 my ($self) = @_;
1290 1879
1291 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1292 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1881 "$UNIQUEDIR/$path"
1293} 1882}
1294 1883
1295# and all this just because we cannot iterate over 1884# and all this just because we cannot iterate over
1296# all maps in C++... 1885# all maps in C++...
1297sub change_all_map_light { 1886sub change_all_map_light {
… …
1299 1888
1300 $_->change_map_light ($change) 1889 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1890 for grep $_->outdoor, values %cf::MAP;
1302} 1891}
1303 1892
1893sub decay_objects {
1894 my ($self) = @_;
1895
1896 return if $self->{deny_reset};
1897
1898 $self->do_decay_objects;
1899}
1900
1304sub unlink_save { 1901sub unlink_save {
1305 my ($self) = @_; 1902 my ($self) = @_;
1306 1903
1307 utf8::encode (my $save = $self->save_path); 1904 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1905 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1906 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1315} 1907}
1316 1908
1317sub load_header_from($) { 1909sub load_header_from($) {
1318 my ($self, $path) = @_; 1910 my ($self, $path) = @_;
1319 1911
1320 utf8::encode $path; 1912 utf8::encode $path;
1321 #aio_open $path, O_RDONLY, 0 1913 my $f = new_from_file cf::object::thawer $path
1322 # or return;
1323
1324 $self->_load_header ($path)
1325 or return; 1914 or return;
1915
1916 $self->_load_header ($f)
1917 or return;
1918
1919 local $MAP_LOADING{$self->{path}} = $self;
1920 $f->resolve_delayed_derefs;
1326 1921
1327 $self->{load_path} = $path; 1922 $self->{load_path} = $path;
1328 1923
1329 1 1924 1
1330} 1925}
… …
1369 $self->load_header_orig 1964 $self->load_header_orig
1370 or return; 1965 or return;
1371 $self->prepare_orig; 1966 $self->prepare_orig;
1372 } 1967 }
1373 1968
1969 $self->{deny_reset} = 1
1970 if $self->no_reset;
1971
1972 $self->default_region (cf::region::find_by_path $self->{path})
1973 unless $self->default_region;
1974
1374 1 1975 1
1375} 1976}
1376 1977
1377sub find; 1978sub find;
1378sub find { 1979sub find {
1379 my ($path, $origin) = @_; 1980 my ($path, $origin) = @_;
1380 1981
1381 $path = normalise $path, $origin && $origin->path; 1982 $path = normalise $path, $origin && $origin->path;
1382 1983
1984 cf::lock_wait "map_data:$path";#d#remove
1383 cf::lock_wait "map_find:$path"; 1985 cf::lock_wait "map_find:$path";
1384 1986
1385 $cf::MAP{$path} || do { 1987 $cf::MAP{$path} || do {
1386 my $guard = cf::lock_acquire "map_find:$path"; 1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1387 my $map = new_from_path cf::map $path 1991 my $map = new_from_path cf::map $path
1388 or return; 1992 or return;
1389 1993
1390 $map->{last_save} = $cf::RUNTIME; 1994 $map->{last_save} = $cf::RUNTIME;
1391 1995
1392 $map->load_header 1996 $map->load_header
1393 or return; 1997 or return;
1394 1998
1395 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1396 # doing this can freeze the server in a sync job, obviously 2000 # doing this can freeze the server in a sync job, obviously
1397 #$cf::WAIT_FOR_TICK->wait; 2001 #$cf::WAIT_FOR_TICK->wait;
2002 undef $guard1;
2003 undef $guard2;
1398 $map->reset; 2004 $map->reset;
1399 undef $guard;
1400 return find $path; 2005 return find $path;
1401 } 2006 }
1402 2007
1403 $cf::MAP{$path} = $map 2008 $cf::MAP{$path} = $map
1404 } 2009 }
… …
1411 my ($self) = @_; 2016 my ($self) = @_;
1412 2017
1413 local $self->{deny_reset} = 1; # loading can take a long time 2018 local $self->{deny_reset} = 1; # loading can take a long time
1414 2019
1415 my $path = $self->{path}; 2020 my $path = $self->{path};
2021
2022 {
1416 my $guard = cf::lock_acquire "map_load:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1417 2024
2025 return unless $self->valid;
1418 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1419 2027
1420 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1421 2029
1422 $self->alloc; 2030 $self->alloc;
1423 2031
1424 $self->pre_load; 2032 $self->pre_load;
2033 cf::cede_to_tick;
1425 2034
1426 $self->_load_objects ($self->{load_path}, 1) 2035 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block;
2037 $self->_load_objects ($f)
1427 or return; 2038 or return;
1428 2039
1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1430 if delete $self->{load_original}; 2041 if delete $self->{load_original};
1431 2042
1432 if (my $uniq = $self->uniq_path) { 2043 if (my $uniq = $self->uniq_path) {
1433 utf8::encode $uniq; 2044 utf8::encode $uniq;
1434 if (aio_open $uniq, O_RDONLY, 0) { 2045 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) {
1435 $self->clear_unique_items; 2047 $self->clear_unique_items;
1436 $self->_load_objects ($uniq, 0); 2048 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs;
2050 }
1437 } 2051 }
1438 } 2052 }
1439 2053
1440 Coro::cede; 2054 $f->resolve_delayed_derefs;
1441 2055
2056 cf::cede_to_tick;
1442 # now do the right thing for maps 2057 # now do the right thing for maps
1443 $self->link_multipart_objects; 2058 $self->link_multipart_objects;
1444
1445 unless ($self->{deny_activate}) {
1446 $self->decay_objects;
1447 $self->fix_auto_apply;
1448 $self->update_buttons;
1449 Coro::cede;
1450 $self->set_darkness_map;
1451 $self->difficulty ($self->estimate_difficulty) 2059 $self->difficulty ($self->estimate_difficulty)
1452 unless $self->difficulty; 2060 unless $self->difficulty;
1453 Coro::cede; 2061 cf::cede_to_tick;
2062
2063 unless ($self->{deny_activate}) {
2064 $self->decay_objects;
2065 $self->fix_auto_apply;
2066 $self->update_buttons;
2067 cf::cede_to_tick;
2068 $self->set_darkness_map;
2069 cf::cede_to_tick;
1454 $self->activate; 2070 $self->activate;
2071 }
2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_IN_MEMORY);
1455 } 2077 }
1456 2078
1457 $self->post_load; 2079 $self->post_load;
1458
1459 $self->in_memory (cf::MAP_IN_MEMORY);
1460} 2080}
1461 2081
1462sub customise_for { 2082sub customise_for {
1463 my ($self, $ob) = @_; 2083 my ($self, $ob) = @_;
1464 2084
1465 return find "~" . $ob->name . "/" . $self->{path} 2085 return find "~" . $ob->name . "/" . $self->{path}
1466 if $self->per_player; 2086 if $self->per_player;
1467 2087
2088# return find "?party/" . $ob->name . "/" . $self->{path}
2089# if $self->per_party;
2090
1468 $self 2091 $self
1469} 2092}
1470 2093
1471# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1472sub load_diag { 2095sub load_neighbours {
1473 my ($map) = @_; 2096 my ($map) = @_;
1474 2097
1475 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1476 2099
1477 for (0 .. 3) { 2100 for (0 .. 3) {
1478 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1479 or next; 2102 or next;
1480 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1481 or next; 2104 or next;
1482 $neigh->load; 2105 $neigh->load;
1483 2106
2107 push @neigh,
1484 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1485 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1486 } 2110 }
1487 2111
1488 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1489 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1490 or next; 2115 or next;
1491 $neigh->load; 2116 $neigh->load;
1492 } 2117 }
1493} 2118}
1494 2119
… …
1499} 2124}
1500 2125
1501sub do_load_sync { 2126sub do_load_sync {
1502 my ($map) = @_; 2127 my ($map) = @_;
1503 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1504 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1505} 2133}
1506 2134
1507our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1508our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1509 2137
1510sub find_async { 2138sub find_async {
1511 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1512 2140
1513 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1514 2142
1515 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1516 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1517 } 2145 }
1518 2146
1519 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1520 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1521 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1522 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1523 my $map = find $path 2154 if (my $map = find $k) {
1524 or next;
1525 $map->load; 2155 $map->load if $v;
2156 }
1526 2157
1527 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1528 } 2159 }
1529 } 2160 }
1530 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1531 }; 2162 };
1532 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
… …
1535} 2166}
1536 2167
1537sub save { 2168sub save {
1538 my ($self) = @_; 2169 my ($self) = @_;
1539 2170
1540 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1541 2172
1542 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1543 2174
1544 return unless $self->dirty; 2175 return unless $self->dirty;
1545 2176
… …
1551 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1552 2183
1553 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1554 2185
1555 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1556 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1557 }; 2189 };
1558 2190
1559 if ($uniq) { 2191 if ($uniq) {
1560 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1568 my ($self) = @_; 2200 my ($self) = @_;
1569 2201
1570 # save first because save cedes 2202 # save first because save cedes
1571 $self->save; 2203 $self->save;
1572 2204
1573 my $lock = cf::lock_acquire "map_data:" . $self->path; 2205 my $lock = cf::lock_acquire "map_data:$self->{path}";
1574 2206
1575 return if $self->players; 2207 return if $self->players;
1576 return if $self->in_memory != cf::MAP_IN_MEMORY; 2208 return if $self->in_memory != cf::MAP_IN_MEMORY;
1577 return if $self->{deny_save}; 2209 return if $self->{deny_save};
1578 2210
2211 $self->in_memory (cf::MAP_SWAPPED);
2212
2213 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP;
1579 $self->clear; 2215 $self->clear;
1580 $self->in_memory (cf::MAP_SWAPPED);
1581} 2216}
1582 2217
1583sub reset_at { 2218sub reset_at {
1584 my ($self) = @_; 2219 my ($self) = @_;
1585 2220
1586 # TODO: safety, remove and allow resettable per-player maps 2221 # TODO: safety, remove and allow resettable per-player maps
1587 return 1e99 if $self->isa ("ext::map_per_player");#d#
1588 return 1e99 if $self->{deny_reset}; 2222 return 1e99 if $self->{deny_reset};
1589 2223
1590 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2224 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1591 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2225 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1592 2226
… …
1603 my ($self) = @_; 2237 my ($self) = @_;
1604 2238
1605 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2239 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 2240
1607 return if $self->players; 2241 return if $self->players;
1608 return if $self->isa ("ext::map_per_player");#d#
1609 2242
1610 warn "resetting map ", $self->path;#d# 2243 warn "resetting map ", $self->path;
1611 2244
1612 $self->in_memory (cf::MAP_SWAPPED); 2245 $self->in_memory (cf::MAP_SWAPPED);
1613 2246
1614 # need to save uniques path 2247 # need to save uniques path
1615 unless ($self->{deny_save}) { 2248 unless ($self->{deny_save}) {
… …
1619 if $uniq; 2252 if $uniq;
1620 } 2253 }
1621 2254
1622 delete $cf::MAP{$self->path}; 2255 delete $cf::MAP{$self->path};
1623 2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
1624 $self->clear; 2259 $self->clear;
1625
1626 $_->clear_links_to ($self) for values %cf::MAP;
1627 2260
1628 $self->unlink_save; 2261 $self->unlink_save;
1629 $self->destroy; 2262 $self->destroy;
1630} 2263}
1631 2264
1632my $nuke_counter = "aaaa"; 2265my $nuke_counter = "aaaa";
1633 2266
1634sub nuke { 2267sub nuke {
1635 my ($self) = @_; 2268 my ($self) = @_;
1636 2269
2270 {
2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272
1637 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
1638 2274
1639 $self->unlink_save; 2275 $self->unlink_save;
1640 2276
1641 bless $self, "cf::map"; 2277 bless $self, "cf::map";
1642 delete $self->{deny_reset}; 2278 delete $self->{deny_reset};
1643 $self->{deny_save} = 1; 2279 $self->{deny_save} = 1;
1644 $self->reset_timeout (1); 2280 $self->reset_timeout (1);
1645 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1646 2282
1647 $cf::MAP{$self->path} = $self; 2283 $cf::MAP{$self->path} = $self;
2284 }
1648 2285
1649 $self->reset; # polite request, might not happen 2286 $self->reset; # polite request, might not happen
2287}
2288
2289=item $maps = cf::map::tmp_maps
2290
2291Returns an arrayref with all map paths of currently instantiated and saved
2292maps. May block.
2293
2294=cut
2295
2296sub tmp_maps() {
2297 [
2298 map {
2299 utf8::decode $_;
2300 /\.map$/
2301 ? normalise $_
2302 : ()
2303 } @{ aio_readdir $TMPDIR or [] }
2304 ]
2305}
2306
2307=item $maps = cf::map::random_maps
2308
2309Returns an arrayref with all map paths of currently instantiated and saved
2310random maps. May block.
2311
2312=cut
2313
2314sub random_maps() {
2315 [
2316 map {
2317 utf8::decode $_;
2318 /\.map$/
2319 ? normalise "?random/$_"
2320 : ()
2321 } @{ aio_readdir $RANDOMDIR or [] }
2322 ]
1650} 2323}
1651 2324
1652=item cf::map::unique_maps 2325=item cf::map::unique_maps
1653 2326
1654Returns an arrayref of paths of all shared maps that have 2327Returns an arrayref of paths of all shared maps that have
1655instantiated unique items. May block. 2328instantiated unique items. May block.
1656 2329
1657=cut 2330=cut
1658 2331
1659sub unique_maps() { 2332sub unique_maps() {
1660 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2333 [
1661 or return; 2334 map {
1662
1663 my @paths;
1664
1665 for (@$files) {
1666 utf8::decode $_; 2335 utf8::decode $_;
1667 next if /\.pst$/; 2336 /\.map$/
1668 next unless /^$PATH_SEP/o; 2337 ? normalise $_
1669 2338 : ()
1670 push @paths, cf::map::normalise $_; 2339 } @{ aio_readdir $UNIQUEDIR or [] }
1671 } 2340 ]
1672
1673 \@paths
1674} 2341}
1675 2342
1676package cf; 2343package cf;
1677 2344
1678=back 2345=back
… …
1696 map { $_, inv_recursive_ $_->inv } @_ 2363 map { $_, inv_recursive_ $_->inv } @_
1697} 2364}
1698 2365
1699sub inv_recursive { 2366sub inv_recursive {
1700 inv_recursive_ inv $_[0] 2367 inv_recursive_ inv $_[0]
2368}
2369
2370=item $ref = $ob->ref
2371
2372creates and returns a persistent reference to an objetc that can be stored as a string.
2373
2374=item $ob = cf::object::deref ($refstring)
2375
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block.
2378
2379=cut
2380
2381sub deref {
2382 my ($ref) = @_;
2383
2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2385 my ($uuid, $name) = ($1, $2);
2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2387 or return;
2388 $pl->ob->uuid eq $uuid
2389 or return;
2390
2391 $pl->ob
2392 } else {
2393 warn "$ref: cannot resolve object reference\n";
2394 undef
2395 }
1701} 2396}
1702 2397
1703package cf; 2398package cf;
1704 2399
1705=back 2400=back
… …
1724 2419
1725 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2420 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1726 2421
1727 if ($self->{record_replies}) { 2422 if ($self->{record_replies}) {
1728 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2423 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2424
1729 } else { 2425 } else {
2426 my $pl = $self->contr;
2427
2428 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2429 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431
2432 } else {
1730 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
1731 $self->message ($msg, $flags); 2434 $self->message ($msg, $flags);
2435 }
1732 } 2436 }
2437}
2438
2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2440
2441=cut
2442
2443sub cf::object::send_msg {
2444 my $pl = shift->contr
2445 or return;
2446 $pl->send_msg (@_);
1733} 2447}
1734 2448
1735=item $player_object->may ("access") 2449=item $player_object->may ("access")
1736 2450
1737Returns wether the given player is authorized to access resource "access" 2451Returns wether the given player is authorized to access resource "access"
… …
1784 $self->deactivate_recursive; 2498 $self->deactivate_recursive;
1785 2499
1786 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2500 return if UNIVERSAL::isa $self->map, "ext::map_link";
1787 2501
1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1789 if $self->map; 2503 if $self->map && $self->map->{path} ne "{link}";
1790 2504
1791 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2505 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1792} 2506}
1793 2507
1794sub cf::object::player::leave_link { 2508sub cf::object::player::leave_link {
1795 my ($self, $map, $x, $y) = @_; 2509 my ($self, $map, $x, $y) = @_;
2510
2511 return unless $self->contr->active;
1796 2512
1797 my $link_pos = delete $self->{_link_pos}; 2513 my $link_pos = delete $self->{_link_pos};
1798 2514
1799 unless ($map) { 2515 unless ($map) {
1800 # restore original map position 2516 # restore original map position
… …
1814 # use -1 or undef as default coordinates, not 0, 0 2530 # use -1 or undef as default coordinates, not 0, 0
1815 ($x, $y) = ($map->enter_x, $map->enter_y) 2531 ($x, $y) = ($map->enter_x, $map->enter_y)
1816 if $x <=0 && $y <= 0; 2532 if $x <=0 && $y <= 0;
1817 2533
1818 $map->load; 2534 $map->load;
1819 $map->load_diag; 2535 $map->load_neighbours;
1820 2536
1821 return unless $self->contr->active; 2537 return unless $self->contr->active;
1822 $self->activate_recursive; 2538 $self->activate_recursive;
2539
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1823 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
1824} 2542}
1825 2543
1826cf::player->attach ( 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1827 on_logout => sub {
1828 my ($pl) = @_;
1829 2545
1830 # abort map switching before logout 2546Moves the player to the given map-path and coordinates by first freezing
1831 if ($pl->ob->{_link_pos}) { 2547her, loading and preparing them map, calling the provided $check callback
1832 cf::sync_job { 2548that has to return the map if sucecssful, and then unfreezes the player on
1833 $pl->ob->leave_link 2549the new (success) or old (failed) map position. In either case, $done will
1834 }; 2550be called at the end of this process.
1835 }
1836 },
1837 on_login => sub {
1838 my ($pl) = @_;
1839 2551
1840 # try to abort aborted map switching on player login :)
1841 # should happen only on crashes
1842 if ($pl->ob->{_link_pos}) {
1843 $pl->ob->enter_link;
1844 (async {
1845 # we need this sleep as the login has a concurrent enter_exit running
1846 # and this sleep increases chances of the player not ending up in scorn
1847 $pl->ob->reply (undef,
1848 "There was an internal problem at your last logout, "
1849 . "the server will try to bring you to your intended destination in a second.",
1850 cf::NDI_RED);
1851 Coro::Timer::sleep 1;
1852 $pl->ob->leave_link;
1853 })->prio (2);
1854 }
1855 },
1856);
1857
1858=item $player_object->goto ($path, $x, $y)
1859
1860=cut 2552=cut
2553
2554our $GOTOGEN;
1861 2555
1862sub cf::object::player::goto { 2556sub cf::object::player::goto {
1863 my ($self, $path, $x, $y) = @_; 2557 my ($self, $path, $x, $y, $check, $done) = @_;
2558
2559 # do generation counting so two concurrent goto's will be executed in-order
2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1864 2561
1865 $self->enter_link; 2562 $self->enter_link;
1866 2563
1867 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2567 # *tag paths override both path and x|y
2568 if ($path =~ /^\*(.*)$/) {
2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2570 my $ob = $obs[rand @obs];
2571
2572 # see if we actually can go there
2573 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2574 $ob = $obs[rand @obs];
2575 } else {
2576 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2577 }
2578 # else put us there anyways for now #d#
2579
2580 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2581 } else {
2582 ($path, $x, $y) = (undef, undef, undef);
2583 }
2584 }
2585
1868 my $map = eval { 2586 my $map = eval {
1869 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2588
2589 if ($map) {
1870 $map = $map->customise_for ($self) if $map; 2590 $map = $map->customise_for ($self);
2591 $map = $check->($map) if $check && $map;
2592 } else {
2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2594 }
2595
1871 $map 2596 $map
2597 };
2598
2599 if ($@) {
2600 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2601 LOG llevError | logBacktrace, Carp::longmess $@;
1872 } or 2602 }
1873 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1874 2603
2604 if ($gen == $self->{_goto_generation}) {
2605 delete $self->{_goto_generation};
1875 $self->leave_link ($map, $x, $y); 2606 $self->leave_link ($map, $x, $y);
2607 }
2608
2609 $done->() if $done;
1876 })->prio (1); 2610 })->prio (1);
1877} 2611}
1878 2612
1879=item $player_object->enter_exit ($exit_object) 2613=item $player_object->enter_exit ($exit_object)
1880 2614
… …
1917 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
1918 } 2652 }
1919 2653
1920 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
1921 2655
1922 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
1923 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
1924 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
1925 2659
1926 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1927 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
1928 undef $fh; 2662 undef $fh;
1929 aio_rename "$meta~", $meta; 2663 aio_rename "$meta~", $meta;
… …
1938 2672
1939 return unless $self->type == cf::PLAYER; 2673 return unless $self->type == cf::PLAYER;
1940 2674
1941 if ($exit->slaying eq "/!") { 2675 if ($exit->slaying eq "/!") {
1942 #TODO: this should de-fi-ni-te-ly not be a sync-job 2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
1943 cf::sync_job { prepare_random_map $exit }; 2679 cf::sync_job { prepare_random_map $exit };
1944 } 2680 }
1945 2681
1946 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1947 my $hp = $exit->stats->hp; 2683 my $hp = $exit->stats->hp;
1948 my $sp = $exit->stats->sp; 2684 my $sp = $exit->stats->sp;
1949 2685
1950 $self->enter_link; 2686 $self->enter_link;
1951 2687
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
1952 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
1953 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
1954 unless (eval { 2696 unless (eval {
1955 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
1956 2698
1957 1; 2699 1;
1958 }) { 2700 }) {
1959 $self->message ("Something went wrong deep within the crossfire server. " 2701 $self->message ("Something went wrong deep within the crossfire server. "
1960 . "I'll try to bring you back to the map you were before. " 2702 . "I'll try to bring you back to the map you were before. "
1961 . "Please report this to the dungeon master!", 2703 . "Please report this to the dungeon master!",
1962 cf::NDI_UNIQUE | cf::NDI_RED); 2704 cf::NDI_UNIQUE | cf::NDI_RED);
1963 2705
1964 warn "ERROR in enter_exit: $@"; 2706 warn "ERROR in enter_exit: $@";
1965 $self->leave_link; 2707 $self->leave_link;
1966 } 2708 }
1967 })->prio (1); 2709 })->prio (1);
… …
1980 2722
1981sub cf::client::send_drawinfo { 2723sub cf::client::send_drawinfo {
1982 my ($self, $text, $flags) = @_; 2724 my ($self, $text, $flags) = @_;
1983 2725
1984 utf8::encode $text; 2726 utf8::encode $text;
1985 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1986} 2728}
1987 2729
2730=item $client->send_msg ($channel, $msg, $color, [extra...])
2731
2732Send a drawinfo or msg packet to the client, formatting the msg for the
2733client if neccessary. C<$type> should be a string identifying the type of
2734the message, with C<log> being the default. If C<$color> is negative, suppress
2735the message unless the client supports the msg packet.
2736
2737=cut
2738
2739# non-persistent channels (usually the info channel)
2740our %CHANNEL = (
2741 "c/identify" => {
2742 id => "infobox",
2743 title => "Identify",
2744 reply => undef,
2745 tooltip => "Items recently identified",
2746 },
2747 "c/examine" => {
2748 id => "infobox",
2749 title => "Examine",
2750 reply => undef,
2751 tooltip => "Signs and other items you examined",
2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2789);
2790
2791sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_;
2793
2794 $msg = $self->pl->expand_cfpod ($msg);
2795
2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797
2798 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2807 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel)
2812 if $self->can_msg;
2813 }
2814
2815 $channel = $channel->{id};
2816 }
2817
2818 return unless @extra || length $msg;
2819
2820 if ($self->can_msg) {
2821 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF;
2824
2825 $self->send_packet ("msg " . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2827 } else {
2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838
2839 $color &= cf::NDI_COLOR_MASK;
2840
2841 utf8::encode $msg;
2842
2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2846 } else {
2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2848 $self->send_packet ("drawinfo $color $msg")
2849 }
2850 }
2851 }
2852}
2853
2854=item $client->ext_msg ($type, @msg)
2855
2856Sends an ext event to the client.
2857
2858=cut
2859
2860sub cf::client::ext_msg($$@) {
2861 my ($self, $type, @msg) = @_;
2862
2863 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove
2866 push @msg, msgtype => "event_$type";
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 }
2869}
2870
2871=item $client->ext_reply ($msgid, @msg)
2872
2873Sends an ext reply to the client.
2874
2875=cut
2876
2877sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_;
2879
2880 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 }
2887}
1988 2888
1989=item $success = $client->query ($flags, "text", \&cb) 2889=item $success = $client->query ($flags, "text", \&cb)
1990 2890
1991Queues a query to the client, calling the given callback with 2891Queues a query to the client, calling the given callback with
1992the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2892the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1993C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2893C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1994 2894
1995Queries can fail, so check the return code. Or don't, as queries will become 2895Queries can fail, so check the return code. Or don't, as queries will
1996reliable at some point in the future. 2896become reliable at some point in the future.
1997 2897
1998=cut 2898=cut
1999 2899
2000sub cf::client::query { 2900sub cf::client::query {
2001 my ($self, $flags, $text, $cb) = @_; 2901 my ($self, $flags, $text, $cb) = @_;
… …
2009 utf8::encode $text; 2909 utf8::encode $text;
2010 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2910 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2011 2911
2012 $self->send_packet ($self->{query_queue}[0][0]) 2912 $self->send_packet ($self->{query_queue}[0][0])
2013 if @{ $self->{query_queue} } == 1; 2913 if @{ $self->{query_queue} } == 1;
2914
2915 1
2014} 2916}
2015 2917
2016cf::client->attach ( 2918cf::client->attach (
2919 on_connect => sub {
2920 my ($ns) = @_;
2921
2922 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2923 },
2017 on_reply => sub { 2924 on_reply => sub {
2018 my ($ns, $msg) = @_; 2925 my ($ns, $msg) = @_;
2019 2926
2020 # this weird shuffling is so that direct followup queries 2927 # this weird shuffling is so that direct followup queries
2021 # get handled first 2928 # get handled first
… …
2033 } else { 2940 } else {
2034 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2941 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2035 } 2942 }
2036 } 2943 }
2037 }, 2944 },
2945 on_exticmd => sub {
2946 my ($ns, $buf) = @_;
2947
2948 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2949
2950 if (ref $msg) {
2951 my ($type, $reply, @payload) =
2952 "ARRAY" eq ref $msg
2953 ? @$msg
2954 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2955
2956 my @reply;
2957
2958 if (my $cb = $EXTICMD{$type}) {
2959 @reply = $cb->($ns, @payload);
2960 }
2961
2962 $ns->ext_reply ($reply, @reply)
2963 if $reply;
2964
2965 } else {
2966 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2967 }
2968
2969 cf::override;
2970 },
2038); 2971);
2039 2972
2040=item $client->async (\&cb) 2973=item $client->async (\&cb)
2041 2974
2042Create a new coroutine, running the specified callback. The coroutine will 2975Create a new coroutine, running the specified callback. The coroutine will
… …
2083our $safe = new Safe "safe"; 3016our $safe = new Safe "safe";
2084our $safe_hole = new Safe::Hole; 3017our $safe_hole = new Safe::Hole;
2085 3018
2086$SIG{FPE} = 'IGNORE'; 3019$SIG{FPE} = 'IGNORE';
2087 3020
2088$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3021$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math
3023 grepstart grepwhile mapstart mapwhile
3024 sort time
3025));
2089 3026
2090# here we export the classes and methods available to script code 3027# here we export the classes and methods available to script code
2091 3028
2092=pod 3029=pod
2093 3030
2094The following fucntions and emthods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2095 3032
2096 cf::object contr pay_amount pay_player map 3033 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr
3036
2097 cf::object::player player 3037 cf::object::player
2098 cf::player peaceful 3038 player
2099 cf::map trigger 3039
3040 cf::player
3041 peaceful
3042
3043 cf::map
3044 trigger
2100 3045
2101=cut 3046=cut
2102 3047
2103for ( 3048for (
2104 ["cf::object" => qw(contr pay_amount pay_player map)], 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race
3051 decrease_ob_nr destroy)],
2105 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2106 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2107 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2108) { 3055) {
2109 no strict 'refs'; 3056 no strict 'refs';
… …
2180=back 3127=back
2181 3128
2182=cut 3129=cut
2183 3130
2184############################################################################# 3131#############################################################################
2185
2186=head2 EXTENSION DATABASE SUPPORT
2187
2188Crossfire maintains a very simple database for extension use. It can
2189currently store anything that can be serialised using Storable, which
2190excludes objects.
2191
2192The parameter C<$family> should best start with the name of the extension
2193using it, it should be unique.
2194
2195=over 4
2196
2197=item $value = cf::db_get $family => $key
2198
2199Returns a single value from the database.
2200
2201=item cf::db_put $family => $key => $value
2202
2203Stores the given C<$value> in the family.
2204
2205=cut
2206
2207our $DB;
2208
2209sub db_init {
2210 unless ($DB) {
2211 $DB = BDB::db_create $DB_ENV;
2212
2213 cf::sync_job {
2214 eval {
2215 $DB->set_flags (BDB::CHKSUM);
2216
2217 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2218 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2219 cf::cleanup "db_open(db): $!" if $!;
2220 };
2221 cf::cleanup "db_open(db): $@" if $@;
2222 };
2223
2224 my $path = cf::localdir . "/database.pst";
2225 if (stat $path) {
2226 cf::sync_job {
2227 my $pst = Storable::retrieve $path;
2228
2229 cf::db_put (board => data => $pst->{board});
2230 cf::db_put (guildrules => data => $pst->{guildrules});
2231 cf::db_put (rent => balance => $pst->{rent}{balance});
2232 BDB::db_env_txn_checkpoint $DB_ENV;
2233
2234 unlink $path;
2235 };
2236 }
2237 }
2238}
2239
2240sub db_get($$) {
2241 my $key = "$_[0]/$_[1]";
2242
2243 cf::sync_job {
2244 BDB::db_get $DB, undef, $key, my $data;
2245
2246 $! ? ()
2247 : Compress::LZF::sthaw $data
2248 }
2249}
2250
2251sub db_put($$$) {
2252 BDB::dbreq_pri 4;
2253 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2254}
2255
2256#############################################################################
2257# the server's init and main functions 3132# the server's init and main functions
2258 3133
2259sub load_resources { 3134sub load_facedata($) {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3135 my ($path) = @_;
3136
3137 # HACK to clear player env face cache, we need some signal framework
3138 # for this (global event?)
3139 %ext::player_env::MUSIC_FACE_CACHE = ();
3140
3141 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3142
3143 warn "loading facedata from $path\n";
3144
3145 my $facedata;
3146 0 < aio_load $path, $facedata
3147 or die "$path: $!";
3148
3149 $facedata = Coro::Storable::thaw $facedata;
3150
3151 $facedata->{version} == 2
3152 or cf::cleanup "$path: version mismatch, cannot proceed.";
3153
3154 # patch in the exptable
3155 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC,
3157 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3158 };
3159 cf::cede_to_tick;
3160
3161 {
3162 my $faces = $facedata->{faceinfo};
3163
3164 while (my ($face, $info) = each %$faces) {
3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
3167 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap};
3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3171
3172 cf::cede_to_tick;
3173 }
3174
3175 while (my ($face, $info) = each %$faces) {
3176 next unless $info->{smooth};
3177
3178 my $idx = cf::face::find $face
3179 or next;
3180
3181 if (my $smooth = cf::face::find $info->{smooth}) {
3182 cf::face::set_smooth $idx, $smooth;
3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3184 } else {
3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
3186 }
3187
3188 cf::cede_to_tick;
3189 }
3190 }
3191
3192 {
3193 my $anims = $facedata->{animinfo};
3194
3195 while (my ($anim, $info) = each %$anims) {
3196 cf::anim::set $anim, $info->{frames}, $info->{facings};
3197 cf::cede_to_tick;
3198 }
3199
3200 cf::anim::invalidate_all; # d'oh
3201 }
3202
3203 {
3204 # TODO: for gcfclient pleasure, we should give resources
3205 # that gcfclient doesn't grok a >10000 face index.
3206 my $res = $facedata->{resource};
3207
3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212
3213 if ($info->{type} & 1) {
3214 # prepend meta info
3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
3228 } else {
3229 $RESOURCE{$name} = $info;
3230 }
3231
3232 cf::cede_to_tick;
3233 }
3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3237
3238 1
3239}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3260
3261register_exticmd fx_want => sub {
3262 my ($ns, $want) = @_;
3263
3264 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v);
3266 }
3267};
3268
3269sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = ();
3273
3274 load_resource_file "$MAPDIR/regions"
2261 or die "unable to load regions file\n";#d# 3275 or die "unable to load regions file\n";
2262}
2263 3276
2264sub cfg_load { 3277 for (cf::region::list) {
3278 $_->{match} = qr/$_->{match}/
3279 if exists $_->{match};
3280 }
3281}
3282
3283sub reload_facedata {
3284 load_facedata "$DATADIR/facedata"
3285 or die "unable to load facedata\n";
3286}
3287
3288sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296}
3297
3298sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n";
3301}
3302
3303sub reload_resources {
3304 warn "reloading resource files...\n";
3305
3306 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures;
3311
3312 warn "finished reloading resource files\n";
3313}
3314
3315sub init {
3316 reload_resources;
3317}
3318
3319sub reload_config {
2265 open my $fh, "<:utf8", cf::confdir . "/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
2266 or return; 3321 or return;
2267 3322
2268 local $/; 3323 local $/;
2269 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
2270 3325
2271 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2272 3327
2273 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2274 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2280 }; 3335 };
2281 warn $@ if $@; 3336 warn $@ if $@;
2282 } 3337 }
2283} 3338}
2284 3339
2285sub init {
2286 load_resources;
2287}
2288
2289sub main { 3340sub main {
2290 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
2291 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
2292 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2293 (async { 3344 (async {
2294 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
2295 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
2296 }; 3348 };
2297 3349
2298 cfg_load; 3350 reload_config;
2299 db_init; 3351 db_init;
2300 load_extensions; 3352 load_extensions;
2301 3353
2302 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2303 Event::loop; 3356 EV::loop;
2304} 3357}
2305 3358
2306############################################################################# 3359#############################################################################
2307# initialisation and cleanup 3360# initialisation and cleanup
2308 3361
2309# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
2310BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
2311 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
2312 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2313 reentrant => 0,
2314 data => WF_AUTOCANCEL,
2315 signal => $signal,
2316 prio => 0,
2317 cb => sub {
2318 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
2319 },
2320 ); 3368 };
3369 }
3370}
3371
3372sub write_runtime {
3373 my $runtime = "$LOCALDIR/runtime";
3374
3375 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time.
3377
3378 IO::AIO::aio_utime $runtime, undef, undef;
3379
3380 my $guard = cf::lock_acquire "write_runtime";
3381
3382 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3383 or return;
3384
3385 my $value = $cf::RUNTIME + 90 + 10;
3386 # 10 is the runtime save interval, for a monotonic clock
3387 # 60 allows for the watchdog to kill the server.
3388
3389 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3390 and return;
3391
3392 # always fsync - this file is important
3393 aio_fsync $fh
3394 and return;
3395
3396 # touch it again to show we are up-to-date
3397 aio_utime $fh, undef, undef;
3398
3399 close $fh
3400 or return;
3401
3402 aio_rename "$runtime~", $runtime
3403 and return;
3404
3405 warn "runtime file written.\n";
3406
2321 } 3407 1
2322} 3408}
2323 3409
2324sub emergency_save() { 3410sub emergency_save() {
2325 my $freeze_guard = cf::freeze_mainloop; 3411 my $freeze_guard = cf::freeze_mainloop;
2326 3412
… …
2332 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
2333 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
2334 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
2335 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
2336 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2337 $pl->save; 3424 $pl->save;
2338 } 3425 }
2339 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
2340 3427
2341 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
2359 3446
2360 warn Carp::longmess "post_cleanup backtrace" 3447 warn Carp::longmess "post_cleanup backtrace"
2361 if $make_core; 3448 if $make_core;
2362} 3449}
2363 3450
2364sub reload() { 3451sub do_reload_perl() {
2365 # can/must only be called in main 3452 # can/must only be called in main
2366 if ($Coro::current != $Coro::main) { 3453 if ($Coro::current != $Coro::main) {
2367 warn "can only reload from main coroutine"; 3454 warn "can only reload from main coroutine";
2368 return; 3455 return;
2369 } 3456 }
… …
2380 warn "syncing database to disk"; 3467 warn "syncing database to disk";
2381 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
2382 3469
2383 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
2384 3471
2385 warn "cancelling all WF_AUTOCANCEL watchers";
2386 for (Event::all_watchers) {
2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2388 }
2389
2390 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
2391 for (;;) { 3473 for (;;) {
2392 BDB::flush; 3474 BDB::flush;
2393 IO::AIO::flush; 3475 IO::AIO::flush;
2394 Coro::cede; 3476 Coro::cede_notself;
2395 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
2396 warn "iterate..."; 3478 warn "iterate...";
2397 } 3479 }
3480
3481 ++$RELOAD;
2398 3482
2399 warn "cancelling all extension coros"; 3483 warn "cancelling all extension coros";
2400 $_->cancel for values %EXT_CORO; 3484 $_->cancel for values %EXT_CORO;
2401 %EXT_CORO = (); 3485 %EXT_CORO = ();
2402 3486
2403 warn "removing commands"; 3487 warn "removing commands";
2404 %COMMAND = (); 3488 %COMMAND = ();
2405 3489
2406 warn "removing ext commands"; 3490 warn "removing ext/exti commands";
2407 %EXTCMD = (); 3491 %EXTCMD = ();
3492 %EXTICMD = ();
2408 3493
2409 warn "unloading/nuking all extensions"; 3494 warn "unloading/nuking all extensions";
2410 for my $pkg (@EXTS) { 3495 for my $pkg (@EXTS) {
2411 warn "... unloading $pkg"; 3496 warn "... unloading $pkg";
2412 3497
… …
2442 Symbol::delete_package "safe::$_" 3527 Symbol::delete_package "safe::$_"
2443 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2444 3529
2445 warn "unloading cf.pm \"a bit\""; 3530 warn "unloading cf.pm \"a bit\"";
2446 delete $INC{"cf.pm"}; 3531 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"};
2447 3533
2448 # don't, removes xs symbols, too, 3534 # don't, removes xs symbols, too,
2449 # and global variables created in xs 3535 # and global variables created in xs
2450 #Symbol::delete_package __PACKAGE__; 3536 #Symbol::delete_package __PACKAGE__;
2451 3537
… …
2454 warn "reloading cf.pm"; 3540 warn "reloading cf.pm";
2455 require cf; 3541 require cf;
2456 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2457 3543
2458 warn "loading config and database again"; 3544 warn "loading config and database again";
2459 cf::cfg_load; 3545 cf::reload_config;
2460 3546
2461 warn "loading extensions"; 3547 warn "loading extensions";
2462 cf::load_extensions; 3548 cf::load_extensions;
2463 3549
2464 warn "reattaching attachments to objects/players"; 3550 warn "reattaching attachments to objects/players";
2465 _global_reattach; 3551 _global_reattach; # objects, sockets
2466 warn "reattaching attachments to maps"; 3552 warn "reattaching attachments to maps";
2467 reattach $_ for values %MAP; 3553 reattach $_ for values %MAP;
2468 3554 warn "reattaching attachments to players";
2469 warn "loading reloadable resources"; 3555 reattach $_ for values %PLAYER;
2470 load_resources;
2471 3556
2472 warn "leaving sync_job"; 3557 warn "leaving sync_job";
2473 3558
2474 1 3559 1
2475 } or do { 3560 } or do {
2476 warn $@; 3561 warn $@;
2477 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
2478 exit 1;
2479 }; 3563 };
2480 3564
2481 warn "reloaded"; 3565 warn "reloaded";
2482}; 3566};
2483 3567
2484our $RELOAD_WATCHER; # used only during reload 3568our $RELOAD_WATCHER; # used only during reload
2485 3569
3570sub reload_perl() {
3571 # doing reload synchronously and two reloads happen back-to-back,
3572 # coro crashes during coro_state_free->destroy here.
3573
3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3575 do_reload_perl;
3576 undef $RELOAD_WATCHER;
3577 };
3578}
3579
2486register_command "reload" => sub { 3580register_command "reload" => sub {
2487 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
2488 3582
2489 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
2490 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
2491 3585 async {
2492 # doing reload synchronously and two reloads happen back-to-back, 3586 $Coro::current->{desc} = "perl_reload";
2493 # coro crashes during coro_state_free->destroy here.
2494
2495 $RELOAD_WATCHER ||= Event->timer (
2496 reentrant => 0,
2497 after => 0,
2498 data => WF_AUTOCANCEL,
2499 cb => sub {
2500 reload; 3587 reload_perl;
2501 undef $RELOAD_WATCHER;
2502 },
2503 ); 3588 };
2504 } 3589 }
2505}; 3590};
2506 3591
2507unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
2508 3593
2509my $bug_warning = 0; 3594my $bug_warning = 0;
2510 3595
2511$TICK_WATCHER = Event->timer ( 3596our @WAIT_FOR_TICK;
2512 reentrant => 0, 3597our @WAIT_FOR_TICK_BEGIN;
2513 parked => 1, 3598
2514 prio => 0, 3599sub wait_for_tick {
2515 at => $NEXT_TICK || $TICK, 3600 return unless $TICK_WATCHER->is_active;
2516 data => WF_AUTOCANCEL, 3601 return if $Coro::current == $Coro::main;
2517 cb => sub { 3602
3603 my $signal = new Coro::Signal;
3604 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait;
3606}
3607
3608sub wait_for_tick_begin {
3609 return unless $TICK_WATCHER->is_active;
3610 return if $Coro::current == $Coro::main;
3611
3612 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait;
3615}
3616
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2518 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
2519 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2520 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
2521 return; 3621 return;
2522 } 3622 }
2523 3623
2524 $NOW = Event::time; 3624 $NOW = $tick_start = EV::now;
2525 3625
2526 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3627
2527 $RUNTIME += $TICK; 3628 $RUNTIME += $TICK;
2528 $NEXT_TICK += $TICK; 3629 $NEXT_TICK = $_[0]->at;
2529 3630
2530 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2531 $NEXT_RUNTIME_WRITE = $NOW + 10; 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2532 Coro::async_pool { 3633 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver";
2533 write_runtime 3635 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!"; 3636 or warn "ERROR: unable to write runtime file: $!";
2535 };
2536 } 3637 };
2537
2538
2539 $WAIT_FOR_TICK->broadcast;
2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541
2542# my $AFTER = Event::time;
2543# warn $AFTER - $NOW;#d#
2544
2545 # if we are delayed by four ticks or more, skip them all
2546 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2547
2548 $TICK_WATCHER->at ($NEXT_TICK);
2549 $TICK_WATCHER->start;
2550 }, 3638 }
2551); 3639
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3641 $sig->send;
3642 }
3643 while (my $sig = shift @WAIT_FOR_TICK) {
3644 $sig->send;
3645 }
3646
3647 $LOAD = ($NOW - $tick_start) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649
3650 _post_tick;
3651};
3652$TICK_WATCHER->priority (EV::MAXPRI);
2552 3653
2553{ 3654{
2554 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
2555 $BDB_POLL_WATCHER = Event->io ( 3656
2556 reentrant => 0,
2557 fd => BDB::poll_fileno,
2558 poll => 'r',
2559 prio => 0,
2560 data => WF_AUTOCANCEL,
2561 cb => \&BDB::poll_cb,
2562 );
2563 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
2564 3658 BDB::max_poll_reqs $TICK * 0.1;
2565 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
2566 my $status;
2567 my $current = $Coro::current;
2568 (
2569 sub {
2570 $status = $!;
2571 $current->ready; undef $current;
2572 },
2573 sub {
2574 Coro::schedule while defined $current;
2575 $! = $status;
2576 },
2577 )
2578 };
2579 3660
2580 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
2581 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3664 | BDB::LOG_AUTOREMOVE, 1);
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2582 3667
2583 cf::sync_job { 3668 cf::sync_job {
2584 eval { 3669 eval {
2585 BDB::db_env_open 3670 BDB::db_env_open
2586 $DB_ENV, 3671 $DB_ENV,
2587 $BDB_ENV_DIR, 3672 $BDBDIR,
2588 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3673 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2589 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2590 0666; 3675 0666;
2591 3676
2592 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2593
2594 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2595 $DB_ENV->set_lk_detect;
2596 }; 3678 };
2597 3679
2598 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
2599 }; 3681 };
2600 } 3682 }
3683
3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3686 };
3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3689 };
3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3692 };
2601} 3693}
2602 3694
2603{ 3695{
3696 # configure IO::AIO
3697
2604 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
2605
2606 undef $Coro::AIO::WATCHER;
2607 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
2608 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
2609 reentrant => 0,
2610 data => WF_AUTOCANCEL,
2611 fd => IO::AIO::poll_fileno,
2612 poll => 'r',
2613 prio => 6,
2614 cb => \&IO::AIO::poll_cb,
2615 );
2616} 3701}
3702
3703my $_log_backtrace;
3704
3705sub _log_backtrace {
3706 my ($msg, @addr) = @_;
3707
3708 $msg =~ s/\n//;
3709
3710 # limit the # of concurrent backtraces
3711 if ($_log_backtrace < 2) {
3712 ++$_log_backtrace;
3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3716 my @bt = fork_call {
3717 @addr = map { sprintf "%x", $_ } @addr;
3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3720 or die "addr2line: $!";
3721
3722 my @funcs;
3723 my @res = <$fh>;
3724 chomp for @res;
3725 while (@res) {
3726 my ($func, $line) = splice @res, 0, 2, ();
3727 push @funcs, "[$func] $line";
3728 }
3729
3730 @funcs
3731 };
3732
3733 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] $_\n" for @bt;
3735 --$_log_backtrace;
3736 };
3737 } else {
3738 LOG llevInfo, "[ABT] $msg\n";
3739 LOG llevInfo, "[ABT] [suppressed]\n";
3740 }
3741}
3742
3743# load additional modules
3744use cf::pod;
2617 3745
2618END { cf::emergency_save } 3746END { cf::emergency_save }
2619 3747
26201 37481
2621 3749

Diff Legend

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