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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.115 by root, Mon Jan 1 16:50:10 2007 UTC vs.
Revision 1.154 by root, Tue Jan 9 15:36:19 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 29# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 30$YAML::Syck::ImplicitUnicode = 1;
30 31
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 32$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 33
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 34sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
57 58
58binmode STDOUT; 59binmode STDOUT;
59binmode STDERR; 60binmode STDERR;
60 61
61# read virtual server time, if available 62# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 72mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 73mkdir $RANDOM_MAPS;
73 74
74# a special map that is always available 75# a special map that is always available
75our $LINK_MAP; 76our $LINK_MAP;
76 77our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 78
79############################################################################# 79#############################################################################
80 80
81=head2 GLOBAL VARIABLES 81=head2 GLOBAL VARIABLES
82 82
119 utf8::encode $msg; 119 utf8::encode $msg;
120 120
121 $msg .= "\n" 121 $msg .= "\n"
122 unless $msg =~ /\n$/; 122 unless $msg =~ /\n$/;
123 123
124 LOG llevError, "cfperl: $msg"; 124 LOG llevError, $msg;
125 }; 125 };
126} 126}
127 127
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
155 155
156=head2 UTILITY FUNCTIONS 156=head2 UTILITY FUNCTIONS
157 157
158=over 4 158=over 4
159 159
160=item dumpval $ref
161
160=cut 162=cut
163
164sub dumpval {
165 eval {
166 local $SIG{__DIE__};
167 my $d;
168 if (1) {
169 $d = new Data::Dumper([$_[0]], ["*var"]);
170 $d->Terse(1);
171 $d->Indent(2);
172 $d->Quotekeys(0);
173 $d->Useqq(1);
174 #$d->Bless(...);
175 $d->Seen($_[1]) if @_ > 1;
176 $d = $d->Dump();
177 }
178 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
179 $d
180 } || "[unable to dump $_[0]: '$@']";
181}
161 182
162use JSON::Syck (); # TODO# replace by JSON::PC once working 183use JSON::Syck (); # TODO# replace by JSON::PC once working
163 184
164=item $ref = cf::from_json $json 185=item $ref = cf::from_json $json
165 186
180 201
181sub to_json($) { 202sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 203 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 204 JSON::Syck::Dump $_[0]
184} 205}
206
207=item cf::lock_wait $string
208
209Wait until the given lock is available. See cf::lock_acquire.
210
211=item my $lock = cf::lock_acquire $string
212
213Wait until the given lock is available and then acquires it and returns
214a Coro::guard object. If the guard object gets destroyed (goes out of scope,
215for example when the coroutine gets canceled), the lock is automatically
216returned.
217
218Lock names should begin with a unique identifier (for example, cf::map::find
219uses map_find and cf::map::load uses map_load).
220
221=cut
222
223our %LOCK;
224
225sub lock_wait($) {
226 my ($key) = @_;
227
228 # wait for lock, if any
229 while ($LOCK{$key}) {
230 push @{ $LOCK{$key} }, $Coro::current;
231 Coro::schedule;
232 }
233}
234
235sub lock_acquire($) {
236 my ($key) = @_;
237
238 # wait, to be sure we are not locked
239 lock_wait $key;
240
241 $LOCK{$key} = [];
242
243 Coro::guard {
244 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} };
246 }
247}
248
249sub freeze_mainloop {
250 return unless $TICK_WATCHER->is_active;
251
252 my $guard = Coro::guard { $TICK_WATCHER->start };
253 $TICK_WATCHER->stop;
254 $guard
255}
256
257=item cf::async { BLOCK }
258
259Currently the same as Coro::async_pool, meaning you cannot use
260C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
261thing you are allowed to do is call C<prio> on it.
262
263=cut
264
265BEGIN { *async = \&Coro::async_pool }
185 266
186=item cf::sync_job { BLOCK } 267=item cf::sync_job { BLOCK }
187 268
188The design of crossfire+ requires that the main coro ($Coro::main) is 269The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 270always able to handle events or runnable, as crossfire+ is only partly
203 # this is the main coro, too bad, we have to block 284 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 285 # till the operation succeeds, freezing the server :/
205 286
206 # TODO: use suspend/resume instead 287 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 288 # (but this is cancel-safe)
208 local $FREEZE = 1; 289 my $freeze_guard = freeze_mainloop;
209 290
210 my $busy = 1; 291 my $busy = 1;
211 my @res; 292 my @res;
212 293
213 (Coro::async { 294 (async {
214 @res = eval { $job->() }; 295 @res = eval { $job->() };
215 warn $@ if $@; 296 warn $@ if $@;
216 undef $busy; 297 undef $busy;
217 })->prio (Coro::PRIO_MAX); 298 })->prio (Coro::PRIO_MAX);
218 299
219 while ($busy) { 300 while ($busy) {
220 Coro::cede_notself; 301 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 302 }
223 303
224 wantarray ? @res : $res[0] 304 wantarray ? @res : $res[0]
225 } else { 305 } else {
226 # we are in another coroutine, how wonderful, everything just works 306 # we are in another coroutine, how wonderful, everything just works
227 307
228 $job->() 308 $job->()
229 } 309 }
230} 310}
231 311
232=item $coro = cf::coro { BLOCK } 312=item $coro = cf::async_ext { BLOCK }
233 313
234Creates and returns a new coro. This coro is automcatially being canceled 314Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 315extension calling this is being unloaded.
236 316
237=cut 317=cut
238 318
239sub coro(&) { 319sub async_ext(&) {
240 my $cb = shift; 320 my $cb = shift;
241 321
242 my $coro; $coro = async { 322 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 323
249 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
251 }); 326 });
252 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
281=cut 356=cut
282 357
283############################################################################# 358#############################################################################
284 359
285package cf::path; 360package cf::path;
361
362# used to convert map paths into valid unix filenames by repalcing / by ∕
363our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
286 364
287sub new { 365sub new {
288 my ($class, $path, $base) = @_; 366 my ($class, $path, $base) = @_;
289 367
290 $path = $path->as_string if ref $path; 368 $path = $path->as_string if ref $path;
354# } 432# }
355} 433}
356 434
357# escape the /'s in the path 435# escape the /'s in the path
358sub _escaped_path { 436sub _escaped_path {
359 # ∕ is U+2215
360 (my $path = $_[0]{path}) =~ s/\///g; 437 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
361 $path 438 $path
362} 439}
363 440
364# the original (read-only) location 441# the original (read-only) location
365sub load_path { 442sub load_path {
817 (aio_load "$filename.pst", $av) >= 0 894 (aio_load "$filename.pst", $av) >= 0
818 or return; 895 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 896 $av = eval { (Storable::thaw $av)->{objs} };
820 } 897 }
821 898
899 warn sprintf "loading %s (%d)\n",
900 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 901 return ($data, $av);
823} 902}
824 903
825############################################################################# 904#############################################################################
826# command handling &c 905# command handling &c
1017 1096
1018=head2 CORE EXTENSIONS 1097=head2 CORE EXTENSIONS
1019 1098
1020Functions and methods that extend core crossfire objects. 1099Functions and methods that extend core crossfire objects.
1021 1100
1101=cut
1102
1103package cf::player;
1104
1105use Coro::AIO;
1106
1022=head3 cf::player 1107=head3 cf::player
1023 1108
1024=over 4 1109=over 4
1025 1110
1026=item cf::player::exists $login 1111=item cf::player::find $login
1027 1112
1028Returns true when the given account exists. 1113Returns the given player object, loading it if necessary (might block).
1029 1114
1030=cut 1115=cut
1031 1116
1032sub cf::player::exists($) { 1117sub playerdir($) {
1033 cf::player::find $_[0] 1118 cf::localdir
1034 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1119 . "/"
1120 . cf::playerdir
1121 . "/"
1122 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1123}
1124
1125sub path($) {
1126 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1127
1128 (playerdir $login) . "/$login.pl"
1129}
1130
1131sub find_active($) {
1132 $cf::PLAYER{$_[0]}
1133 and $cf::PLAYER{$_[0]}->active
1134 and $cf::PLAYER{$_[0]}
1135}
1136
1137sub exists($) {
1138 my ($login) = @_;
1139
1140 $cf::PLAYER{$login}
1141 or cf::sync_job { !aio_stat $login }
1142}
1143
1144sub find($) {
1145 return $cf::PLAYER{$_[0]} || do {
1146 my $login = $_[0];
1147
1148 my $guard = cf::lock_acquire "user_find:$login";
1149
1150 $cf::PLAYER{$_[0]} || do {
1151 my $pl = load_pl path $login
1152 or return;
1153 $cf::PLAYER{$login} = $pl
1154 }
1155 }
1156}
1157
1158sub save($) {
1159 my ($pl) = @_;
1160
1161 return if $pl->{deny_save};
1162
1163 my $path = path $pl;
1164 my $guard = cf::lock_acquire "user_save:$path";
1165
1166 return if $pl->{deny_save};
1167
1168 aio_mkdir playerdir $pl, 0770;
1169 $pl->{last_save} = $cf::RUNTIME;
1170
1171 $pl->save_pl ($path);
1172 Coro::cede;
1173}
1174
1175sub new($) {
1176 my ($login) = @_;
1177
1178 my $self = create;
1179
1180 $self->ob->name ($login);
1181 $self->{deny_save} = 1;
1182
1183 $cf::PLAYER{$login} = $self;
1184
1185 $self
1186}
1187
1188=item $pl->quit_character
1189
1190Nukes the player without looking back. If logged in, the connection will
1191be destroyed. May block for a long time.
1192
1193=cut
1194
1195sub quit_character {
1196 my ($pl) = @_;
1197
1198 $pl->{deny_save} = 1;
1199 $pl->password ("*"); # this should lock out the player until we nuked the dir
1200
1201 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1202 $pl->deactivate;
1203 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1204 $pl->ns->destroy if $pl->ns;
1205
1206 my $path = playerdir $pl;
1207 my $temp = "$path~$cf::RUNTIME~deleting~";
1208 aio_rename $path, $temp;
1209 delete $cf::PLAYER{$pl->ob->name};
1210 $pl->destroy;
1211 IO::AIO::aio_rmtree $temp;
1212}
1213
1214=item cf::player::list_logins
1215
1216Returns am arrayref of all valid playernames in the system, can take a
1217while and may block, so not sync_job-capable, ever.
1218
1219=cut
1220
1221sub list_logins {
1222 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1223 or return [];
1224
1225 my @logins;
1226
1227 for my $login (@$dirs) {
1228 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229 aio_read $fh, 0, 512, my $buf, 0 or next;
1230 $buf !~ /^password -------------$/ or next; # official not-valid tag
1231
1232 utf8::decode $login;
1233 push @logins, $login;
1234 }
1235
1236 \@logins
1237}
1238
1239=item $player->maps
1240
1241Returns an arrayref of cf::path's of all maps that are private for this
1242player. May block.
1243
1244=cut
1245
1246sub maps($) {
1247 my ($pl) = @_;
1248
1249 my $files = aio_readdir playerdir $pl
1250 or return;
1251
1252 my @paths;
1253
1254 for (@$files) {
1255 utf8::decode $_;
1256 next if /\.(?:pl|pst)$/;
1257 next unless /^$PATH_SEP/;
1258
1259 s/$PATH_SEP/\//g;
1260 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1261 }
1262
1263 \@paths
1035} 1264}
1036 1265
1037=item $player->ext_reply ($msgid, $msgtype, %msg) 1266=item $player->ext_reply ($msgid, $msgtype, %msg)
1038 1267
1039Sends an ext reply to the player. 1268Sends an ext reply to the player.
1040 1269
1041=cut 1270=cut
1042 1271
1043sub cf::player::ext_reply($$$%) { 1272sub ext_reply($$$%) {
1044 my ($self, $id, %msg) = @_; 1273 my ($self, $id, %msg) = @_;
1045 1274
1046 $msg{msgid} = $id; 1275 $msg{msgid} = $id;
1047 1276
1048 $self->send ("ext " . to_json \%msg); 1277 $self->send ("ext " . cf::to_json \%msg);
1049} 1278}
1279
1280package cf;
1050 1281
1051=back 1282=back
1052 1283
1053 1284
1054=head3 cf::map 1285=head3 cf::map
1060package cf::map; 1291package cf::map;
1061 1292
1062use Fcntl; 1293use Fcntl;
1063use Coro::AIO; 1294use Coro::AIO;
1064 1295
1065our $MAX_RESET = 7200; 1296our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1297our $DEFAULT_RESET = 3000;
1067 1298
1068sub generate_random_map { 1299sub generate_random_map {
1069 my ($path, $rmp) = @_; 1300 my ($path, $rmp) = @_;
1070 1301
1071 # mit "rum" bekleckern, nicht 1302 # mit "rum" bekleckern, nicht
1087# and all this just because we cannot iterate over 1318# and all this just because we cannot iterate over
1088# all maps in C++... 1319# all maps in C++...
1089sub change_all_map_light { 1320sub change_all_map_light {
1090 my ($change) = @_; 1321 my ($change) = @_;
1091 1322
1092 $_->change_map_light ($change) for values %cf::MAP; 1323 $_->change_map_light ($change)
1324 for grep $_->outdoor, values %cf::MAP;
1093} 1325}
1094 1326
1095sub try_load_header($) { 1327sub try_load_header($) {
1096 my ($path) = @_; 1328 my ($path) = @_;
1097 1329
1100 or return; 1332 or return;
1101 1333
1102 my $map = cf::map::new 1334 my $map = cf::map::new
1103 or return; 1335 or return;
1104 1336
1337 # for better error messages only, will be overwritten
1338 $map->path ($path);
1339
1105 $map->load_header ($path) 1340 $map->load_header ($path)
1106 or return; 1341 or return;
1107 1342
1108 $map->{load_path} = $path; 1343 $map->{load_path} = $path;
1109 1344
1110 $map 1345 $map
1111} 1346}
1112 1347
1348sub find;
1113sub find_map { 1349sub find {
1114 my ($path, $origin) = @_; 1350 my ($path, $origin) = @_;
1115 1351
1116 #warn "find_map<$path,$origin>\n";#d# 1352 #warn "find<$path,$origin>\n";#d#
1117 1353
1118 $path = new cf::path $path, $origin && $origin->path; 1354 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1355 my $key = $path->as_string;
1120 1356
1357 cf::lock_wait "map_find:$key";
1358
1121 $cf::MAP{$key} || do { 1359 $cf::MAP{$key} || do {
1360 my $guard = cf::lock_acquire "map_find:$key";
1361
1122 # do it the slow way 1362 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1363 my $map = try_load_header $path->save_path;
1124 1364
1365 Coro::cede;
1366
1125 if ($map) { 1367 if ($map) {
1368 $map->last_access ((delete $map->{last_access})
1369 || $cf::RUNTIME); #d#
1126 # safety 1370 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1371 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1372 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1373 } else {
1130 if (my $rmp = $path->random_map_params) { 1374 if (my $rmp = $path->random_map_params) {
1135 1379
1136 $map or return; 1380 $map or return;
1137 1381
1138 $map->{load_original} = 1; 1382 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1383 $map->{instantiate_time} = $cf::RUNTIME;
1384 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1385 $map->instantiate;
1141 1386
1142 # per-player maps become, after loading, normal maps 1387 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1388 $map->per_player (0) if $path->{user_rel};
1144 } 1389 }
1145 1390
1146 $map->path ($key); 1391 $map->path ($key);
1147 $map->{path} = $path; 1392 $map->{path} = $path;
1148 $map->last_access ($cf::RUNTIME); 1393 $map->{last_save} = $cf::RUNTIME;
1394
1395 Coro::cede;
1149 1396
1150 if ($map->should_reset) { 1397 if ($map->should_reset) {
1151 $map->reset; 1398 $map->reset;
1399 undef $guard;
1152 $map = find_map $path; 1400 $map = find $path
1401 or return;
1153 } 1402 }
1154 1403
1155 $cf::MAP{$key} = $map 1404 $cf::MAP{$key} = $map
1156 } 1405 }
1157} 1406}
1158 1407
1159sub load { 1408sub load {
1160 my ($self) = @_; 1409 my ($self) = @_;
1161 1410
1411 my $path = $self->{path};
1412 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1413
1162 return if $self->in_memory != cf::MAP_SWAPPED; 1414 return if $self->in_memory != cf::MAP_SWAPPED;
1163 1415
1164 $self->in_memory (cf::MAP_LOADING); 1416 $self->in_memory (cf::MAP_LOADING);
1165
1166 my $path = $self->{path};
1167 1417
1168 $self->alloc; 1418 $self->alloc;
1169 $self->load_objects ($self->{load_path}, 1) 1419 $self->load_objects ($self->{load_path}, 1)
1170 or return; 1420 or return;
1171 1421
1177 if (aio_open $uniq, O_RDONLY, 0) { 1427 if (aio_open $uniq, O_RDONLY, 0) {
1178 $self->clear_unique_items; 1428 $self->clear_unique_items;
1179 $self->load_objects ($uniq, 0); 1429 $self->load_objects ($uniq, 0);
1180 } 1430 }
1181 } 1431 }
1432
1433 Coro::cede;
1182 1434
1183 # now do the right thing for maps 1435 # now do the right thing for maps
1184 $self->link_multipart_objects; 1436 $self->link_multipart_objects;
1185 1437
1186 if ($self->{path}->is_style_map) { 1438 if ($self->{path}->is_style_map) {
1194 $self->difficulty ($self->estimate_difficulty) 1446 $self->difficulty ($self->estimate_difficulty)
1195 unless $self->difficulty; 1447 unless $self->difficulty;
1196 $self->activate; 1448 $self->activate;
1197 } 1449 }
1198 1450
1451 Coro::cede;
1452
1199 $self->in_memory (cf::MAP_IN_MEMORY); 1453 $self->in_memory (cf::MAP_IN_MEMORY);
1200} 1454}
1201 1455
1202sub load_map_sync { 1456sub find_sync {
1203 my ($path, $origin) = @_; 1457 my ($path, $origin) = @_;
1204 1458
1205 #warn "load_map_sync<$path, $origin>\n";#d# 1459 cf::sync_job { cf::map::find $path, $origin }
1460}
1206 1461
1207 cf::sync_job { 1462sub do_load_sync {
1208 my $map = cf::map::find_map $path, $origin 1463 my ($map) = @_;
1209 or return; 1464
1210 $map->load; 1465 cf::sync_job { $map->load };
1211 $map
1212 }
1213} 1466}
1214 1467
1215sub save { 1468sub save {
1216 my ($self) = @_; 1469 my ($self) = @_;
1217 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1473 $self->{last_save} = $cf::RUNTIME;
1474
1475 return unless $self->dirty;
1476
1218 my $save = $self->{path}->save_path; utf8::encode $save; 1477 my $save = $self->{path}->save_path; utf8::encode $save;
1219 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1478 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220 1479
1221 $self->{last_save} = $cf::RUNTIME;
1222
1223 return unless $self->dirty;
1224
1225 $self->{load_path} = $save; 1480 $self->{load_path} = $save;
1226 1481
1227 return if $self->{deny_save}; 1482 return if $self->{deny_save};
1483
1484 local $self->{last_access} = $self->last_access;#d#
1485
1486 cf::async {
1487 $_->contr->save for $self->players;
1488 };
1228 1489
1229 if ($uniq) { 1490 if ($uniq) {
1230 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1491 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1231 $self->save_objects ($uniq, cf::IO_UNIQUES); 1492 $self->save_objects ($uniq, cf::IO_UNIQUES);
1232 } else { 1493 } else {
1235} 1496}
1236 1497
1237sub swap_out { 1498sub swap_out {
1238 my ($self) = @_; 1499 my ($self) = @_;
1239 1500
1501 # save first because save cedes
1502 $self->save;
1503
1504 my $lock = cf::lock_acquire "map_data:" . $self->path;
1505
1240 return if $self->players; 1506 return if $self->players;
1241 return if $self->in_memory != cf::MAP_IN_MEMORY; 1507 return if $self->in_memory != cf::MAP_IN_MEMORY;
1242 return if $self->{deny_save}; 1508 return if $self->{deny_save};
1243 1509
1244 $self->save;
1245 $self->clear; 1510 $self->clear;
1246 $self->in_memory (cf::MAP_SWAPPED); 1511 $self->in_memory (cf::MAP_SWAPPED);
1247} 1512}
1248 1513
1249sub reset_at { 1514sub reset_at {
1287} 1552}
1288 1553
1289sub reset { 1554sub reset {
1290 my ($self) = @_; 1555 my ($self) = @_;
1291 1556
1557 my $lock = cf::lock_acquire "map_data:" . $self->path;
1558
1292 return if $self->players; 1559 return if $self->players;
1293 return if $self->{path}{user_rel};#d# 1560 return if $self->{path}{user_rel};#d#
1294 1561
1295 warn "resetting map ", $self->path;#d# 1562 warn "resetting map ", $self->path;#d#
1296 1563
1315 1582
1316sub customise_for { 1583sub customise_for {
1317 my ($map, $ob) = @_; 1584 my ($map, $ob) = @_;
1318 1585
1319 if ($map->per_player) { 1586 if ($map->per_player) {
1320 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1587 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1321 } 1588 }
1322 1589
1323 $map 1590 $map
1324} 1591}
1325 1592
1326sub emergency_save { 1593sub emergency_save {
1327 local $cf::FREEZE = 1; 1594 my $freeze_guard = cf::freeze_mainloop;
1328 1595
1329 warn "enter emergency map save\n"; 1596 warn "enter emergency perl save\n";
1330 1597
1331 cf::sync_job { 1598 cf::sync_job {
1599 warn "begin emergency player save\n";
1600 $_->save for values %cf::PLAYER;
1601 warn "end emergency player save\n";
1602
1332 warn "begin emergency map save\n"; 1603 warn "begin emergency map save\n";
1333 $_->save for values %cf::MAP; 1604 $_->save for values %cf::MAP;
1605 warn "end emergency map save\n";
1334 }; 1606 };
1335 1607
1336 warn "end emergency map save\n"; 1608 warn "leave emergency perl save\n";
1337} 1609}
1338 1610
1339package cf; 1611package cf;
1340 1612
1341=back 1613=back
1404=cut 1676=cut
1405 1677
1406sub cf::object::player::enter_link { 1678sub cf::object::player::enter_link {
1407 my ($self) = @_; 1679 my ($self) = @_;
1408 1680
1681 $self->deactivate_recursive;
1682
1409 return if $self->map == $LINK_MAP; 1683 return if $self->map == $LINK_MAP;
1410 1684
1411 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1685 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1412 if $self->map; 1686 if $self->map;
1413 1687
1414 $self->enter_map ($LINK_MAP, 20, 20); 1688 $self->enter_map ($LINK_MAP, 20, 20);
1415 $self->deactivate_recursive;
1416} 1689}
1417 1690
1418sub cf::object::player::leave_link { 1691sub cf::object::player::leave_link {
1419 my ($self, $map, $x, $y) = @_; 1692 my ($self, $map, $x, $y) = @_;
1420 1693
1421 my $link_pos = delete $self->{_link_pos}; 1694 my $link_pos = delete $self->{_link_pos};
1422 1695
1423 unless ($map) { 1696 unless ($map) {
1424 # restore original map position 1697 # restore original map position
1425 ($map, $x, $y) = @{ $link_pos || [] }; 1698 ($map, $x, $y) = @{ $link_pos || [] };
1426 $map = cf::map::find_map $map; 1699 $map = cf::map::find $map;
1427 1700
1428 unless ($map) { 1701 unless ($map) {
1429 ($map, $x, $y) = @$EMERGENCY_POSITION; 1702 ($map, $x, $y) = @$EMERGENCY_POSITION;
1430 $map = cf::map::find_map $map 1703 $map = cf::map::find $map
1431 or die "FATAL: cannot load emergency map\n"; 1704 or die "FATAL: cannot load emergency map\n";
1432 } 1705 }
1433 } 1706 }
1434 1707
1435 ($x, $y) = (-1, -1) 1708 ($x, $y) = (-1, -1)
1439 ($x, $y) = ($map->enter_x, $map->enter_y) 1712 ($x, $y) = ($map->enter_x, $map->enter_y)
1440 if $x <=0 && $y <= 0; 1713 if $x <=0 && $y <= 0;
1441 1714
1442 $map->load; 1715 $map->load;
1443 1716
1717 return unless $self->contr->active;
1444 $self->activate_recursive; 1718 $self->activate_recursive;
1445 $self->enter_map ($map, $x, $y); 1719 $self->enter_map ($map, $x, $y);
1446} 1720}
1447 1721
1722cf::player->attach (
1723 on_logout => sub {
1724 my ($pl) = @_;
1725
1726 # abort map switching before logout
1727 if ($pl->ob->{_link_pos}) {
1728 cf::sync_job {
1729 $pl->ob->leave_link
1730 };
1731 }
1732 },
1733 on_login => sub {
1734 my ($pl) = @_;
1735
1736 # try to abort aborted map switching on player login :)
1737 # should happen only on crashes
1738 if ($pl->ob->{_link_pos}) {
1739 $pl->ob->enter_link;
1740 (async {
1741 # we need this sleep as the login has a concurrent enter_exit running
1742 # and this sleep increases chances of the player not ending up in scorn
1743 $pl->ob->reply (undef,
1744 "There was an internal problem at your last logout, "
1745 . "the server will try to bring you to your intended destination in a second.",
1746 cf::NDI_RED);
1747 Coro::Timer::sleep 1;
1748 $pl->ob->leave_link;
1749 })->prio (2);
1750 }
1751 },
1752);
1753
1448=item $player_object->goto_map ($map, $x, $y) 1754=item $player_object->goto ($path, $x, $y)
1449 1755
1450=cut 1756=cut
1451 1757
1452sub cf::object::player::goto_map { 1758sub cf::object::player::goto {
1453 my ($self, $path, $x, $y) = @_; 1759 my ($self, $path, $x, $y) = @_;
1454 1760
1761 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763
1455 $self->enter_link; 1764 $self->enter_link;
1456 1765
1457 (Coro::async { 1766 (async {
1458 $path = new cf::path $path;
1459
1460 my $map = cf::map::find_map $path->as_string; 1767 my $map = cf::map::find $path->as_string;
1461 $map = $map->customise_for ($self) if $map; 1768 $map = $map->customise_for ($self) if $map;
1462 1769
1463 warn "entering ", $map->path, " at ($x, $y)\n" 1770# warn "entering ", $map->path, " at ($x, $y)\n"
1464 if $map; 1771# if $map;
1465 1772
1466 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1773 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1467 1774
1468 $self->leave_link ($map, $x, $y); 1775 $self->leave_link ($map, $x, $y);
1469 })->prio (1); 1776 })->prio (1);
1470} 1777}
1471 1778
1524 1831
1525 return unless $self->type == cf::PLAYER; 1832 return unless $self->type == cf::PLAYER;
1526 1833
1527 $self->enter_link; 1834 $self->enter_link;
1528 1835
1529 (Coro::async { 1836 (async {
1837 $self->deactivate_recursive; # just to be sure
1530 unless (eval { 1838 unless (eval {
1531
1532 prepare_random_map $exit 1839 prepare_random_map $exit
1533 if $exit->slaying eq "/!"; 1840 if $exit->slaying eq "/!";
1534 1841
1535 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1842 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1536 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1843 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1537 1844
1538 1; 1845 1;
1539 }) { 1846 }) {
1540 $self->message ("Something went wrong deep within the crossfire server. " 1847 $self->message ("Something went wrong deep within the crossfire server. "
1541 . "I'll try to bring you back to the map you were before. " 1848 . "I'll try to bring you back to the map you were before. "
1598 on_reply => sub { 1905 on_reply => sub {
1599 my ($ns, $msg) = @_; 1906 my ($ns, $msg) = @_;
1600 1907
1601 # this weird shuffling is so that direct followup queries 1908 # this weird shuffling is so that direct followup queries
1602 # get handled first 1909 # get handled first
1603 my $queue = delete $ns->{query_queue}; 1910 my $queue = delete $ns->{query_queue}
1911 or return; # be conservative, not sure how that can happen, but we saw a crash here
1604 1912
1605 (shift @$queue)->[1]->($msg); 1913 (shift @$queue)->[1]->($msg);
1606 1914
1607 push @{ $ns->{query_queue} }, @$queue; 1915 push @{ $ns->{query_queue} }, @$queue;
1608 1916
1614 } 1922 }
1615 } 1923 }
1616 }, 1924 },
1617); 1925);
1618 1926
1619=item $client->coro (\&cb) 1927=item $client->async (\&cb)
1620 1928
1621Create a new coroutine, running the specified callback. The coroutine will 1929Create a new coroutine, running the specified callback. The coroutine will
1622be automatically cancelled when the client gets destroyed (e.g. on logout, 1930be automatically cancelled when the client gets destroyed (e.g. on logout,
1623or loss of connection). 1931or loss of connection).
1624 1932
1625=cut 1933=cut
1626 1934
1627sub cf::client::coro { 1935sub cf::client::async {
1628 my ($self, $cb) = @_; 1936 my ($self, $cb) = @_;
1629 1937
1630 my $coro; $coro = async { 1938 my $coro = &Coro::async ($cb);
1631 eval {
1632 $cb->();
1633 };
1634 warn $@ if $@;
1635 };
1636 1939
1637 $coro->on_destroy (sub { 1940 $coro->on_destroy (sub {
1638 delete $self->{_coro}{$coro+0}; 1941 delete $self->{_coro}{$coro+0};
1639 }); 1942 });
1640 1943
1812 2115
1813{ 2116{
1814 my $path = cf::localdir . "/database.pst"; 2117 my $path = cf::localdir . "/database.pst";
1815 2118
1816 sub db_load() { 2119 sub db_load() {
1817 warn "loading database $path\n";#d# remove later
1818 $DB = stat $path ? Storable::retrieve $path : { }; 2120 $DB = stat $path ? Storable::retrieve $path : { };
1819 } 2121 }
1820 2122
1821 my $pid; 2123 my $pid;
1822 2124
1823 sub db_save() { 2125 sub db_save() {
1824 warn "saving database $path\n";#d# remove later
1825 waitpid $pid, 0 if $pid; 2126 waitpid $pid, 0 if $pid;
1826 if (0 == ($pid = fork)) { 2127 if (0 == ($pid = fork)) {
1827 $DB->{_meta}{version} = 1; 2128 $DB->{_meta}{version} = 1;
1828 Storable::nstore $DB, "$path~"; 2129 Storable::nstore $DB, "$path~";
1829 rename "$path~", $path; 2130 rename "$path~", $path;
1877 open my $fh, "<:utf8", cf::confdir . "/config" 2178 open my $fh, "<:utf8", cf::confdir . "/config"
1878 or return; 2179 or return;
1879 2180
1880 local $/; 2181 local $/;
1881 *CFG = YAML::Syck::Load <$fh>; 2182 *CFG = YAML::Syck::Load <$fh>;
2183
2184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2185
2186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2188
2189 if (exists $CFG{mlockall}) {
2190 eval {
2191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2192 and die "WARNING: m(un)lockall failed: $!\n";
2193 };
2194 warn $@ if $@;
2195 }
1882} 2196}
1883 2197
1884sub main { 2198sub main {
1885 # we must not ever block the main coroutine 2199 # we must not ever block the main coroutine
1886 local $Coro::idle = sub { 2200 local $Coro::idle = sub {
1887 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1888 (Coro::unblock_sub {
1889 Event::one_event; 2202 async { Event::one_event };
1890 })->();
1891 }; 2203 };
1892 2204
1893 cfg_load; 2205 cfg_load;
1894 db_load; 2206 db_load;
1895 load_extensions; 2207 load_extensions;
1906 return; 2218 return;
1907 } 2219 }
1908 2220
1909 warn "reloading..."; 2221 warn "reloading...";
1910 2222
1911 local $FREEZE = 1; 2223 my $guard = freeze_mainloop;
1912 cf::emergency_save; 2224 cf::emergency_save;
1913 2225
1914 eval { 2226 eval {
1915 # if anything goes wrong in here, we should simply crash as we already saved 2227 # if anything goes wrong in here, we should simply crash as we already saved
1916 2228
1978 cf::load_extensions; 2290 cf::load_extensions;
1979 2291
1980 # reattach attachments to objects 2292 # reattach attachments to objects
1981 warn "reattach"; 2293 warn "reattach";
1982 _global_reattach; 2294 _global_reattach;
2295 reattach $_ for values %MAP;
1983 }; 2296 };
1984 2297
1985 if ($@) { 2298 if ($@) {
1986 warn $@; 2299 warn $@;
1987 warn "error while reloading, exiting."; 2300 warn "error while reloading, exiting.";
2003 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2316 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2004 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2317 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2005 2318
2006 # dirty hack because... archetypes are not yet loaded 2319 # dirty hack because... archetypes are not yet loaded
2007 Event->timer ( 2320 Event->timer (
2008 after => 2, 2321 after => 10,
2009 cb => sub { 2322 cb => sub {
2010 $_[0]->w->cancel; 2323 $_[0]->w->cancel;
2011 2324
2012 # provide some exits "home" 2325 # provide some exits "home"
2013 my $exit = cf::object::new "exit"; 2326 my $exit = cf::object::new "exit";
2052 reentrant => 0, 2365 reentrant => 0,
2053 prio => 0, 2366 prio => 0,
2054 at => $NEXT_TICK || $TICK, 2367 at => $NEXT_TICK || $TICK,
2055 data => WF_AUTOCANCEL, 2368 data => WF_AUTOCANCEL,
2056 cb => sub { 2369 cb => sub {
2057 unless ($FREEZE) {
2058 cf::server_tick; # one server iteration 2370 cf::server_tick; # one server iteration
2059 $RUNTIME += $TICK; 2371 $RUNTIME += $TICK;
2060 }
2061
2062 $NEXT_TICK += $TICK; 2372 $NEXT_TICK += $TICK;
2063 2373
2064 # if we are delayed by four ticks or more, skip them all 2374 # if we are delayed by four ticks or more, skip them all
2065 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2375 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2066 2376
2089 or warn "ERROR: unable to write runtime file: $!"; 2399 or warn "ERROR: unable to write runtime file: $!";
2090 })->(); 2400 })->();
2091 }, 2401 },
2092); 2402);
2093 2403
2404END { cf::emergency_save }
2405
20941 24061
2095 2407

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines