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.113 by root, Mon Jan 1 15:32:40 2007 UTC vs.
Revision 1.145 by root, Sun Jan 7 21:54:59 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 Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item cf::lock_wait $string
186
187Wait until the given lock is available. See cf::lock_acquire.
188
189=item my $lock = cf::lock_acquire $string
190
191Wait until the given lock is available and then acquires it and returns
192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
193for example when the coroutine gets canceled), the lock is automatically
194returned.
195
196Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load).
198
199=cut
200
201our %LOCK;
202
203sub lock_wait($) {
204 my ($key) = @_;
205
206 # wait for lock, if any
207 while ($LOCK{$key}) {
208 push @{ $LOCK{$key} }, $Coro::current;
209 Coro::schedule;
210 }
211}
212
213sub lock_acquire($) {
214 my ($key) = @_;
215
216 # wait, to be sure we are not locked
217 lock_wait $key;
218
219 $LOCK{$key} = [];
220
221 Coro::guard {
222 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} };
224 }
225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
186=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
187 246
188The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
205 264
206 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 266 # (but this is cancel-safe)
208 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
209 268
210 my $busy = 1; 269 my $busy = 1;
211 my @res; 270 my @res;
212 271
213 (Coro::async { 272 (async {
214 @res = eval { $job->() }; 273 @res = eval { $job->() };
215 warn $@ if $@; 274 warn $@ if $@;
216 undef $busy; 275 undef $busy;
217 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
218 277
219 while ($busy) { 278 while ($busy) {
220 Coro::cede_notself; 279 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 280 }
223 281
224 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
225 } else { 283 } else {
226 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
227 285
228 $job->() 286 $job->()
229 } 287 }
230} 288}
231 289
232=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
233 291
234Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 293extension calling this is being unloaded.
236 294
237=cut 295=cut
238 296
239sub coro(&) { 297sub async_ext(&) {
240 my $cb = shift; 298 my $cb = shift;
241 299
242 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 301
249 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
251 }); 304 });
252 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
289 342
290 $path = $path->as_string if ref $path; 343 $path = $path->as_string if ref $path;
291 344
292 my $self = bless { }, $class; 345 my $self = bless { }, $class;
293 346
347 # {... are special paths that are not touched
348 # ?xxx/... are special absolute paths
349 # ?random/... random maps
350 # /! non-realised random map exit
351 # /... normal maps
352 # ~/... per-player maps without a specific player (DO NOT USE)
353 # ~user/... per-player map of a specific user
354
355 if ($path =~ /^{/) {
356 # fine as it is
294 if ($path =~ s{^\?random/}{}) { 357 } elsif ($path =~ s{^\?random/}{}) {
295 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 358 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
296 $self->{random} = cf::from_json $data; 359 $self->{random} = cf::from_json $data;
297 } else { 360 } else {
298 if ($path =~ s{^~([^/]+)?}{}) { 361 if ($path =~ s{^~([^/]+)?}{}) {
299 $self->{user_rel} = 1; 362 $self->{user_rel} = 1;
… …
807 (aio_load "$filename.pst", $av) >= 0 870 (aio_load "$filename.pst", $av) >= 0
808 or return; 871 or return;
809 $av = eval { (Storable::thaw $av)->{objs} }; 872 $av = eval { (Storable::thaw $av)->{objs} };
810 } 873 }
811 874
875 warn sprintf "loading %s (%d)\n",
876 $filename, length $data, scalar @{$av || []};#d#
812 return ($data, $av); 877 return ($data, $av);
813} 878}
814 879
815############################################################################# 880#############################################################################
816# command handling &c 881# command handling &c
… …
1007 1072
1008=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1009 1074
1010Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1011 1076
1077=cut
1078
1079package cf::player;
1080
1012=head3 cf::player 1081=head3 cf::player
1013 1082
1014=over 4 1083=over 4
1015 1084
1016=item cf::player::exists $login 1085=item cf::player::find $login
1017 1086
1018Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1019 1088
1020=cut 1089=cut
1021 1090
1022sub cf::player::exists($) { 1091sub playerdir($) {
1023 cf::player::find $_[0] 1092 cf::localdir
1024 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137 $pl->{last_save} = $cf::RUNTIME;
1138
1139 Coro::cede;
1140 $pl->save_pl ($path);
1141 Coro::cede;
1142}
1143
1144sub new($) {
1145 my ($login) = @_;
1146
1147 my $self = create;
1148
1149 $self->ob->name ($login);
1150 $self->{deny_save} = 1;
1151
1152 $cf::PLAYER{$login} = $self;
1153
1154 $self
1155}
1156
1157sub quit_character {
1158 my ($pl) = @_;
1159
1160 $pl->{deny_save} = 1;
1161 $pl->password ("*"); # this should lock out the player until we nuked the dir
1162
1163 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1164 $pl->deactivate;
1165 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1166 $pl->ns->destroy if $pl->ns;
1167
1168 my $path = playerdir $pl;
1169 my $temp = "$path~$cf::RUNTIME~deleting~";
1170 IO::AIO::aio_rename $path, $temp, sub {
1171 delete $cf::PLAYER{$pl->ob->name};
1172 $pl->destroy;
1173
1174 IO::AIO::aio_rmtree $temp;
1175 };
1025} 1176}
1026 1177
1027=item $player->ext_reply ($msgid, $msgtype, %msg) 1178=item $player->ext_reply ($msgid, $msgtype, %msg)
1028 1179
1029Sends an ext reply to the player. 1180Sends an ext reply to the player.
1030 1181
1031=cut 1182=cut
1032 1183
1033sub cf::player::ext_reply($$$%) { 1184sub ext_reply($$$%) {
1034 my ($self, $id, %msg) = @_; 1185 my ($self, $id, %msg) = @_;
1035 1186
1036 $msg{msgid} = $id; 1187 $msg{msgid} = $id;
1037 1188
1038 $self->send ("ext " . to_json \%msg); 1189 $self->send ("ext " . cf::to_json \%msg);
1039} 1190}
1191
1192package cf;
1040 1193
1041=back 1194=back
1042 1195
1043 1196
1044=head3 cf::map 1197=head3 cf::map
… …
1050package cf::map; 1203package cf::map;
1051 1204
1052use Fcntl; 1205use Fcntl;
1053use Coro::AIO; 1206use Coro::AIO;
1054 1207
1055our $MAX_RESET = 7200; 1208our $MAX_RESET = 3600;
1056our $DEFAULT_RESET = 3600; 1209our $DEFAULT_RESET = 3000;
1057 1210
1058sub generate_random_map { 1211sub generate_random_map {
1059 my ($path, $rmp) = @_; 1212 my ($path, $rmp) = @_;
1060 1213
1061 # mit "rum" bekleckern, nicht 1214 # mit "rum" bekleckern, nicht
… …
1077# and all this just because we cannot iterate over 1230# and all this just because we cannot iterate over
1078# all maps in C++... 1231# all maps in C++...
1079sub change_all_map_light { 1232sub change_all_map_light {
1080 my ($change) = @_; 1233 my ($change) = @_;
1081 1234
1082 $_->change_map_light ($change) for values %cf::MAP; 1235 $_->change_map_light ($change)
1236 for grep $_->outdoor, values %cf::MAP;
1083} 1237}
1084 1238
1085sub try_load_header($) { 1239sub try_load_header($) {
1086 my ($path) = @_; 1240 my ($path) = @_;
1087 1241
… …
1090 or return; 1244 or return;
1091 1245
1092 my $map = cf::map::new 1246 my $map = cf::map::new
1093 or return; 1247 or return;
1094 1248
1249 # for better error messages only, will be overwritten
1250 $map->path ($path);
1251
1095 $map->load_header ($path) 1252 $map->load_header ($path)
1096 or return; 1253 or return;
1097 1254
1098 $map->{load_path} = $path; 1255 $map->{load_path} = $path;
1099 1256
1100 $map 1257 $map
1101} 1258}
1102 1259
1260sub find;
1103sub find_map { 1261sub find {
1104 my ($path, $origin) = @_; 1262 my ($path, $origin) = @_;
1105 1263
1106 #warn "find_map<$path,$origin>\n";#d# 1264 #warn "find<$path,$origin>\n";#d#
1107 1265
1108 $path = new cf::path $path, $origin && $origin->path; 1266 $path = new cf::path $path, $origin && $origin->path;
1109 my $key = $path->as_string; 1267 my $key = $path->as_string;
1110 1268
1269 cf::lock_wait "map_find:$key";
1270
1111 $cf::MAP{$key} || do { 1271 $cf::MAP{$key} || do {
1272 my $guard = cf::lock_acquire "map_find:$key";
1273
1112 # do it the slow way 1274 # do it the slow way
1113 my $map = try_load_header $path->save_path; 1275 my $map = try_load_header $path->save_path;
1114 1276
1277 Coro::cede;
1278
1115 if ($map) { 1279 if ($map) {
1280 $map->last_access ((delete $map->{last_access})
1281 || $cf::RUNTIME); #d#
1116 # safety 1282 # safety
1117 $map->{instantiate_time} = $cf::RUNTIME 1283 $map->{instantiate_time} = $cf::RUNTIME
1118 if $map->{instantiate_time} > $cf::RUNTIME; 1284 if $map->{instantiate_time} > $cf::RUNTIME;
1119 } else { 1285 } else {
1120 if (my $rmp = $path->random_map_params) { 1286 if (my $rmp = $path->random_map_params) {
… …
1125 1291
1126 $map or return; 1292 $map or return;
1127 1293
1128 $map->{load_original} = 1; 1294 $map->{load_original} = 1;
1129 $map->{instantiate_time} = $cf::RUNTIME; 1295 $map->{instantiate_time} = $cf::RUNTIME;
1296 $map->last_access ($cf::RUNTIME);
1130 $map->instantiate; 1297 $map->instantiate;
1131 1298
1132 # per-player maps become, after loading, normal maps 1299 # per-player maps become, after loading, normal maps
1133 $map->per_player (0) if $path->{user_rel}; 1300 $map->per_player (0) if $path->{user_rel};
1134 } 1301 }
1135 1302
1136 $map->path ($key); 1303 $map->path ($key);
1137 $map->{path} = $path; 1304 $map->{path} = $path;
1138 $map->last_access ($cf::RUNTIME); 1305 $map->{last_save} = $cf::RUNTIME;
1306
1307 Coro::cede;
1139 1308
1140 if ($map->should_reset) { 1309 if ($map->should_reset) {
1141 $map->reset; 1310 $map->reset;
1311 undef $guard;
1142 $map = find_map $path; 1312 $map = find $path
1313 or return;
1143 } 1314 }
1144 1315
1145 $cf::MAP{$key} = $map 1316 $cf::MAP{$key} = $map
1146 } 1317 }
1147} 1318}
1148 1319
1149sub load { 1320sub load {
1150 my ($self) = @_; 1321 my ($self) = @_;
1151 1322
1323 my $path = $self->{path};
1324 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1325
1152 return if $self->in_memory != cf::MAP_SWAPPED; 1326 return if $self->in_memory != cf::MAP_SWAPPED;
1153 1327
1154 $self->in_memory (cf::MAP_LOADING); 1328 $self->in_memory (cf::MAP_LOADING);
1155
1156 my $path = $self->{path};
1157 1329
1158 $self->alloc; 1330 $self->alloc;
1159 $self->load_objects ($self->{load_path}, 1) 1331 $self->load_objects ($self->{load_path}, 1)
1160 or return; 1332 or return;
1161 1333
… …
1167 if (aio_open $uniq, O_RDONLY, 0) { 1339 if (aio_open $uniq, O_RDONLY, 0) {
1168 $self->clear_unique_items; 1340 $self->clear_unique_items;
1169 $self->load_objects ($uniq, 0); 1341 $self->load_objects ($uniq, 0);
1170 } 1342 }
1171 } 1343 }
1344
1345 Coro::cede;
1172 1346
1173 # now do the right thing for maps 1347 # now do the right thing for maps
1174 $self->link_multipart_objects; 1348 $self->link_multipart_objects;
1175 1349
1176 if ($self->{path}->is_style_map) { 1350 if ($self->{path}->is_style_map) {
… …
1184 $self->difficulty ($self->estimate_difficulty) 1358 $self->difficulty ($self->estimate_difficulty)
1185 unless $self->difficulty; 1359 unless $self->difficulty;
1186 $self->activate; 1360 $self->activate;
1187 } 1361 }
1188 1362
1363 Coro::cede;
1364
1189 $self->in_memory (cf::MAP_IN_MEMORY); 1365 $self->in_memory (cf::MAP_IN_MEMORY);
1190} 1366}
1191 1367
1192sub load_map_sync { 1368sub find_sync {
1193 my ($path, $origin) = @_; 1369 my ($path, $origin) = @_;
1194 1370
1195 #warn "load_map_sync<$path, $origin>\n";#d# 1371 cf::sync_job { cf::map::find $path, $origin }
1372}
1196 1373
1197 cf::sync_job { 1374sub do_load_sync {
1198 my $map = cf::map::find_map $path, $origin 1375 my ($map) = @_;
1199 or return; 1376
1200 $map->load; 1377 cf::sync_job { $map->load };
1201 $map
1202 }
1203} 1378}
1204 1379
1205sub save { 1380sub save {
1206 my ($self) = @_; 1381 my ($self) = @_;
1207 1382
1383 my $lock = cf::lock_acquire "map_data:" . $self->path;
1384
1385 $self->{last_save} = $cf::RUNTIME;
1386
1387 return unless $self->dirty;
1388
1208 my $save = $self->{path}->save_path; utf8::encode $save; 1389 my $save = $self->{path}->save_path; utf8::encode $save;
1209 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1390 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1210 1391
1211 $self->{last_save} = $cf::RUNTIME;
1212
1213 return unless $self->dirty;
1214
1215 $self->{load_path} = $save; 1392 $self->{load_path} = $save;
1216 1393
1217 return if $self->{deny_save}; 1394 return if $self->{deny_save};
1395
1396 local $self->{last_access} = $self->last_access;#d#
1397
1398 cf::async {
1399 $_->contr->save for $self->players;
1400 };
1218 1401
1219 if ($uniq) { 1402 if ($uniq) {
1220 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1403 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1221 $self->save_objects ($uniq, cf::IO_UNIQUES); 1404 $self->save_objects ($uniq, cf::IO_UNIQUES);
1222 } else { 1405 } else {
… …
1225} 1408}
1226 1409
1227sub swap_out { 1410sub swap_out {
1228 my ($self) = @_; 1411 my ($self) = @_;
1229 1412
1413 # save first because save cedes
1414 $self->save;
1415
1416 my $lock = cf::lock_acquire "map_data:" . $self->path;
1417
1230 return if $self->players; 1418 return if $self->players;
1231 return if $self->in_memory != cf::MAP_IN_MEMORY; 1419 return if $self->in_memory != cf::MAP_IN_MEMORY;
1232 return if $self->{deny_save}; 1420 return if $self->{deny_save};
1233 1421
1234 $self->save;
1235 $self->clear; 1422 $self->clear;
1236 $self->in_memory (cf::MAP_SWAPPED); 1423 $self->in_memory (cf::MAP_SWAPPED);
1237} 1424}
1238 1425
1239sub reset_at { 1426sub reset_at {
1240 my ($self) = @_; 1427 my ($self) = @_;
1241 1428
1242 # TODO: safety, remove and allow resettable per-player maps 1429 # TODO: safety, remove and allow resettable per-player maps
1243 return 1e100 if $self->{path}{user_rel}; 1430 return 1e99 if $self->{path}{user_rel};
1244 return 1e100 if $self->{deny_reset}; 1431 return 1e99 if $self->{deny_reset};
1245 1432
1246 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1433 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1247 my $to = $self->reset_timeout || $DEFAULT_RESET; 1434 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1248 $to = $MAX_RESET if $to > $MAX_RESET;
1249 1435
1250 $time + $to 1436 $time + $to
1251} 1437}
1252 1438
1253sub should_reset { 1439sub should_reset {
… …
1269 1455
1270 $self->unlink_save; 1456 $self->unlink_save;
1271 1457
1272 delete $cf::MAP{$self->path}; 1458 delete $cf::MAP{$self->path};
1273 $self->{path} = new cf::path $new_path; 1459 $self->{path} = new cf::path $new_path;
1274 $self->path ($self->{path}->path); 1460 $self->path ($self->{path}->as_string);
1275 $cf::MAP{$self->path} = $self; 1461 $cf::MAP{$self->path} = $self;
1276 1462
1277 $self->save; 1463 $self->save;
1278} 1464}
1279 1465
1280sub reset { 1466sub reset {
1281 my ($self) = @_; 1467 my ($self) = @_;
1282 1468
1469 my $lock = cf::lock_acquire "map_data:" . $self->path;
1470
1283 return if $self->players; 1471 return if $self->players;
1284 return if $self->{path}{user_rel};#d# 1472 return if $self->{path}{user_rel};#d#
1285 1473
1286 warn "resetting map ", $self->path;#d# 1474 warn "resetting map ", $self->path;#d#
1287 1475
… …
1291 1479
1292 $self->unlink_save; 1480 $self->unlink_save;
1293 $self->destroy; 1481 $self->destroy;
1294} 1482}
1295 1483
1484my $nuke_counter = "aaaa";
1485
1486sub nuke {
1487 my ($self) = @_;
1488
1489 $self->{deny_save} = 1;
1490 $self->reset_timeout (1);
1491 $self->rename ("{nuke}/" . ($nuke_counter++));
1492 $self->reset; # polite request, might not happen
1493}
1494
1296sub customise_for { 1495sub customise_for {
1297 my ($map, $ob) = @_; 1496 my ($map, $ob) = @_;
1298 1497
1299 if ($map->per_player) { 1498 if ($map->per_player) {
1300 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1499 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1301 } 1500 }
1302 1501
1303 $map 1502 $map
1304} 1503}
1305 1504
1306sub emergency_save { 1505sub emergency_save {
1307 local $cf::FREEZE = 1; 1506 my $freeze_guard = cf::freeze_mainloop;
1308 1507
1309 warn "enter emergency map save\n"; 1508 warn "enter emergency perl save\n";
1310 1509
1311 cf::sync_job { 1510 cf::sync_job {
1511 warn "begin emergency player save\n";
1512 $_->save for values %cf::PLAYER;
1513 warn "end emergency player save\n";
1514
1312 warn "begin emergency map save\n"; 1515 warn "begin emergency map save\n";
1313 $_->save for values %cf::MAP; 1516 $_->save for values %cf::MAP;
1517 warn "end emergency map save\n";
1314 }; 1518 };
1315 1519
1316 warn "end emergency map save\n"; 1520 warn "leave emergency perl save\n";
1317} 1521}
1318 1522
1319package cf; 1523package cf;
1320 1524
1321=back 1525=back
… …
1363 (ref $cf::CFG{"may_$access"} 1567 (ref $cf::CFG{"may_$access"}
1364 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1568 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1365 : $cf::CFG{"may_$access"}) 1569 : $cf::CFG{"may_$access"})
1366} 1570}
1367 1571
1572=item $player_object->enter_link
1573
1574Freezes the player and moves him/her to a special map (C<{link}>).
1575
1576The player should be reaosnably safe there for short amounts of time. You
1577I<MUST> call C<leave_link> as soon as possible, though.
1578
1579=item $player_object->leave_link ($map, $x, $y)
1580
1581Moves the player out of the specila link map onto the given map. If the
1582map is not valid (or omitted), the player will be moved back to the
1583location he/she was before the call to C<enter_link>, or, if that fails,
1584to the emergency map position.
1585
1586Might block.
1587
1588=cut
1589
1368sub cf::object::player::enter_link { 1590sub cf::object::player::enter_link {
1369 my ($self) = @_; 1591 my ($self) = @_;
1370 1592
1593 $self->deactivate_recursive;
1594
1371 return if $self->map == $LINK_MAP; 1595 return if $self->map == $LINK_MAP;
1372 1596
1373 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1597 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1374 if $self->map; 1598 if $self->map;
1375 1599
1376 $self->enter_map ($LINK_MAP, 20, 20); 1600 $self->enter_map ($LINK_MAP, 20, 20);
1377 $self->deactivate_recursive;
1378} 1601}
1379 1602
1380sub cf::object::player::leave_link { 1603sub cf::object::player::leave_link {
1381 my ($self, $map, $x, $y) = @_; 1604 my ($self, $map, $x, $y) = @_;
1382 1605
1383 my $link_pos = delete $self->{_link_pos}; 1606 my $link_pos = delete $self->{_link_pos};
1384 1607
1385 unless ($map) { 1608 unless ($map) {
1386 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1387
1388 # restore original map position 1609 # restore original map position
1389 ($map, $x, $y) = @{ $link_pos || [] }; 1610 ($map, $x, $y) = @{ $link_pos || [] };
1390 $map = cf::map::find_map $map; 1611 $map = cf::map::find $map;
1391 1612
1392 unless ($map) { 1613 unless ($map) {
1393 ($map, $x, $y) = @$EMERGENCY_POSITION; 1614 ($map, $x, $y) = @$EMERGENCY_POSITION;
1394 $map = cf::map::find_map $map 1615 $map = cf::map::find $map
1395 or die "FATAL: cannot load emergency map\n"; 1616 or die "FATAL: cannot load emergency map\n";
1396 } 1617 }
1397 } 1618 }
1398 1619
1399 ($x, $y) = (-1, -1) 1620 ($x, $y) = (-1, -1)
… …
1403 ($x, $y) = ($map->enter_x, $map->enter_y) 1624 ($x, $y) = ($map->enter_x, $map->enter_y)
1404 if $x <=0 && $y <= 0; 1625 if $x <=0 && $y <= 0;
1405 1626
1406 $map->load; 1627 $map->load;
1407 1628
1629 return unless $self->contr->active;
1408 $self->activate_recursive; 1630 $self->activate_recursive;
1409 $self->enter_map ($map, $x, $y); 1631 $self->enter_map ($map, $x, $y);
1410} 1632}
1411 1633
1634cf::player->attach (
1635 on_logout => sub {
1636 my ($pl) = @_;
1637
1638 # abort map switching before logout
1639 if ($pl->ob->{_link_pos}) {
1640 cf::sync_job {
1641 $pl->ob->leave_link
1642 };
1643 }
1644 },
1645 on_login => sub {
1646 my ($pl) = @_;
1647
1648 # try to abort aborted map switching on player login :)
1649 # should happen only on crashes
1650 if ($pl->ob->{_link_pos}) {
1651 $pl->ob->enter_link;
1652 (async {
1653 # we need this sleep as the login has a concurrent enter_exit running
1654 # and this sleep increases chances of the player not ending up in scorn
1655 $pl->ob->reply (undef,
1656 "There was an internal problem at your last logout, "
1657 . "the server will try to bring you to your intended destination in a second.",
1658 cf::NDI_RED);
1659 Coro::Timer::sleep 1;
1660 $pl->ob->leave_link;
1661 })->prio (2);
1662 }
1663 },
1664);
1665
1412=item $player_object->goto_map ($map, $x, $y) 1666=item $player_object->goto ($path, $x, $y)
1413 1667
1414=cut 1668=cut
1415 1669
1416sub cf::object::player::goto_map { 1670sub cf::object::player::goto {
1417 my ($self, $path, $x, $y) = @_; 1671 my ($self, $path, $x, $y) = @_;
1418 1672
1419 $self->enter_link; 1673 $self->enter_link;
1420 1674
1421 (Coro::async { 1675 (async {
1422 $path = new cf::path $path; 1676 $path = new cf::path $path;
1423 1677
1424 my $map = cf::map::find_map $path->as_string; 1678 my $map = cf::map::find $path->as_string;
1425 $map = $map->customise_for ($self) if $map; 1679 $map = $map->customise_for ($self) if $map;
1426 1680
1427 warn "entering ", $map->path, " at ($x, $y)\n" 1681# warn "entering ", $map->path, " at ($x, $y)\n"
1428 if $map; 1682# if $map;
1683
1684 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1429 1685
1430 $self->leave_link ($map, $x, $y); 1686 $self->leave_link ($map, $x, $y);
1431 })->prio (1); 1687 })->prio (1);
1432} 1688}
1433 1689
… …
1486 1742
1487 return unless $self->type == cf::PLAYER; 1743 return unless $self->type == cf::PLAYER;
1488 1744
1489 $self->enter_link; 1745 $self->enter_link;
1490 1746
1491 (Coro::async { 1747 (async {
1748 $self->deactivate_recursive; # just to be sure
1492 unless (eval { 1749 unless (eval {
1493
1494 prepare_random_map $exit 1750 prepare_random_map $exit
1495 if $exit->slaying eq "/!"; 1751 if $exit->slaying eq "/!";
1496 1752
1497 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1753 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1498 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1754 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1499 1755
1500 1; 1756 1;
1501 }) { 1757 }) {
1502 $self->message ("Something went wrong deep within the crossfire server. " 1758 $self->message ("Something went wrong deep within the crossfire server. "
1503 . "I'll try to bring you back to the map you were before. " 1759 . "I'll try to bring you back to the map you were before. "
… …
1560 on_reply => sub { 1816 on_reply => sub {
1561 my ($ns, $msg) = @_; 1817 my ($ns, $msg) = @_;
1562 1818
1563 # this weird shuffling is so that direct followup queries 1819 # this weird shuffling is so that direct followup queries
1564 # get handled first 1820 # get handled first
1565 my $queue = delete $ns->{query_queue}; 1821 my $queue = delete $ns->{query_queue}
1822 or return; # be conservative, not sure how that can happen, but we saw a crash here
1566 1823
1567 (shift @$queue)->[1]->($msg); 1824 (shift @$queue)->[1]->($msg);
1568 1825
1569 push @{ $ns->{query_queue} }, @$queue; 1826 push @{ $ns->{query_queue} }, @$queue;
1570 1827
… …
1576 } 1833 }
1577 } 1834 }
1578 }, 1835 },
1579); 1836);
1580 1837
1581=item $client->coro (\&cb) 1838=item $client->async (\&cb)
1582 1839
1583Create a new coroutine, running the specified callback. The coroutine will 1840Create a new coroutine, running the specified callback. The coroutine will
1584be automatically cancelled when the client gets destroyed (e.g. on logout, 1841be automatically cancelled when the client gets destroyed (e.g. on logout,
1585or loss of connection). 1842or loss of connection).
1586 1843
1587=cut 1844=cut
1588 1845
1589sub cf::client::coro { 1846sub cf::client::async {
1590 my ($self, $cb) = @_; 1847 my ($self, $cb) = @_;
1591 1848
1592 my $coro; $coro = async { 1849 my $coro = &Coro::async ($cb);
1593 eval {
1594 $cb->();
1595 };
1596 warn $@ if $@;
1597 };
1598 1850
1599 $coro->on_destroy (sub { 1851 $coro->on_destroy (sub {
1600 delete $self->{_coro}{$coro+0}; 1852 delete $self->{_coro}{$coro+0};
1601 }); 1853 });
1602 1854
… …
1774 2026
1775{ 2027{
1776 my $path = cf::localdir . "/database.pst"; 2028 my $path = cf::localdir . "/database.pst";
1777 2029
1778 sub db_load() { 2030 sub db_load() {
1779 warn "loading database $path\n";#d# remove later
1780 $DB = stat $path ? Storable::retrieve $path : { }; 2031 $DB = stat $path ? Storable::retrieve $path : { };
1781 } 2032 }
1782 2033
1783 my $pid; 2034 my $pid;
1784 2035
1785 sub db_save() { 2036 sub db_save() {
1786 warn "saving database $path\n";#d# remove later
1787 waitpid $pid, 0 if $pid; 2037 waitpid $pid, 0 if $pid;
1788 if (0 == ($pid = fork)) { 2038 if (0 == ($pid = fork)) {
1789 $DB->{_meta}{version} = 1; 2039 $DB->{_meta}{version} = 1;
1790 Storable::nstore $DB, "$path~"; 2040 Storable::nstore $DB, "$path~";
1791 rename "$path~", $path; 2041 rename "$path~", $path;
… …
1839 open my $fh, "<:utf8", cf::confdir . "/config" 2089 open my $fh, "<:utf8", cf::confdir . "/config"
1840 or return; 2090 or return;
1841 2091
1842 local $/; 2092 local $/;
1843 *CFG = YAML::Syck::Load <$fh>; 2093 *CFG = YAML::Syck::Load <$fh>;
2094
2095 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2096
2097 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2098 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2099
2100 if (exists $CFG{mlockall}) {
2101 eval {
2102 $CFG{mlockall} ? &mlockall : &munlockall
2103 and die "WARNING: m(un)lockall failed: $!\n";
2104 };
2105 warn $@ if $@;
2106 }
1844} 2107}
1845 2108
1846sub main { 2109sub main {
1847 # we must not ever block the main coroutine 2110 # we must not ever block the main coroutine
1848 local $Coro::idle = sub { 2111 local $Coro::idle = sub {
1849 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2112 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1850 (Coro::unblock_sub {
1851 Event::one_event; 2113 async { Event::one_event };
1852 })->();
1853 }; 2114 };
1854 2115
1855 cfg_load; 2116 cfg_load;
1856 db_load; 2117 db_load;
1857 load_extensions; 2118 load_extensions;
… …
1868 return; 2129 return;
1869 } 2130 }
1870 2131
1871 warn "reloading..."; 2132 warn "reloading...";
1872 2133
1873 local $FREEZE = 1; 2134 my $guard = freeze_mainloop;
1874 cf::emergency_save; 2135 cf::emergency_save;
1875 2136
1876 eval { 2137 eval {
1877 # if anything goes wrong in here, we should simply crash as we already saved 2138 # if anything goes wrong in here, we should simply crash as we already saved
1878 2139
… …
1940 cf::load_extensions; 2201 cf::load_extensions;
1941 2202
1942 # reattach attachments to objects 2203 # reattach attachments to objects
1943 warn "reattach"; 2204 warn "reattach";
1944 _global_reattach; 2205 _global_reattach;
2206 reattach $_ for values %MAP;
1945 }; 2207 };
1946 2208
1947 if ($@) { 2209 if ($@) {
1948 warn $@; 2210 warn $@;
1949 warn "error while reloading, exiting."; 2211 warn "error while reloading, exiting.";
… …
1965 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1966 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1967 2229
1968 # dirty hack because... archetypes are not yet loaded 2230 # dirty hack because... archetypes are not yet loaded
1969 Event->timer ( 2231 Event->timer (
1970 after => 2, 2232 after => 10,
1971 cb => sub { 2233 cb => sub {
1972 $_[0]->w->cancel; 2234 $_[0]->w->cancel;
1973 2235
1974 # provide some exits "home" 2236 # provide some exits "home"
1975 my $exit = cf::object::new "exit"; 2237 my $exit = cf::object::new "exit";
… …
2014 reentrant => 0, 2276 reentrant => 0,
2015 prio => 0, 2277 prio => 0,
2016 at => $NEXT_TICK || $TICK, 2278 at => $NEXT_TICK || $TICK,
2017 data => WF_AUTOCANCEL, 2279 data => WF_AUTOCANCEL,
2018 cb => sub { 2280 cb => sub {
2019 unless ($FREEZE) {
2020 cf::server_tick; # one server iteration 2281 cf::server_tick; # one server iteration
2021 $RUNTIME += $TICK; 2282 $RUNTIME += $TICK;
2022 }
2023
2024 $NEXT_TICK += $TICK; 2283 $NEXT_TICK += $TICK;
2025 2284
2026 # if we are delayed by four ticks or more, skip them all 2285 # if we are delayed by four ticks or more, skip them all
2027 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2286 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2028 2287
… …
2051 or warn "ERROR: unable to write runtime file: $!"; 2310 or warn "ERROR: unable to write runtime file: $!";
2052 })->(); 2311 })->();
2053 }, 2312 },
2054); 2313);
2055 2314
2315END { cf::emergency_save }
2316
20561 23171
2057 2318

Diff Legend

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